vlc | branch: master | Martin Storsjö <[email protected]> | Thu Apr 19 14:40:48 2018 +0300| [5157dc8988d6c2f7b3f07da9951c1d43053d42be] | committer: Martin Storsjö
contrib: aom: Use asm/intrinsics on windows on arm/aarch64 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5157dc8988d6c2f7b3f07da9951c1d43053d42be --- contrib/src/aom/rules.mak | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak index b884dc3f43..4f6c8fb499 100644 --- a/contrib/src/aom/rules.mak +++ b/contrib/src/aom/rules.mak @@ -45,9 +45,13 @@ endif ifdef HAVE_WIN32 ifneq ($(filter arm aarch64, $(ARCH)),) -# These configurations don't build with asm enabled yet, witout further -# patching. -AOM_CONF += -DAOM_TARGET_CPU=generic +# 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 +AOM_CONF += -DAOM_ADS2GAS_REQUIRED=1 -DAOM_ADS2GAS=../build/make/ads2gas.pl -DAOM_ADS2GAS_OPTS="-thumb;-noelf" -DAOM_GAS_EXT=S endif endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
