vlc/vlc-3.0 | branch: master | Felix Paul Kühne <[email protected]> | Tue Oct 9 15:12:47 2018 +0200| [018225d5b4bddde7340cb1930f252d9aff068e7c] | committer: Tristan Matthews
contrib/aom: fix compilation for iOS and tvOS (cherry picked from commit b479f6d26ae8c12873fd32b208894ff0753f2c00) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=018225d5b4bddde7340cb1930f252d9aff068e7c --- contrib/src/aom/rules.mak | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak index b1a2fe14d0..d5c18b52d9 100644 --- a/contrib/src/aom/rules.mak +++ b/contrib/src/aom/rules.mak @@ -57,6 +57,17 @@ AOM_CONF += -DAOM_ADS2GAS_REQUIRED=1 -DAOM_ADS2GAS=../build/make/ads2gas.pl -DAO endif endif +ifdef HAVE_IOS +ifneq ($(filter arm aarch64, $(ARCH)),) +# These targets don't have runtime cpu detection. +AOM_CONF += -DCONFIG_RUNTIME_CPU_DETECT=0 +endif +ifeq ($(ARCH),arm) +# armv7, not just plain arm +AOM_CONF += -DAOM_TARGET_CPU=armv7 +endif +endif + # libaom doesn't allow in-tree builds .aom: aom toolchain.cmake cd $< && mkdir -p aom_build _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
