[vlc-commits] contrib: aom: Set AOM_TARGET_CPU=generic for windows on arm/arm64

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Sat Apr  7 00:35:48 2018 +0300| [674f4dac30e179638e52eb3a38aaefefa79da85b] | committer: Martin Storsjö

contrib: aom: Set AOM_TARGET_CPU=generic for windows on arm/arm64

This avoids trying to use any assembler optimizations there; enabling
that requires a bit more patching.

This fixes building aom for armv7 and aarch64 with llvm-mingw.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=674f4dac30e179638e52eb3a38aaefefa79da85b
---

 contrib/src/aom/rules.mak | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index e8904ea7ee..a6a896f47a 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -43,6 +43,14 @@ ifndef HAVE_WIN32
 AOM_CONF += -DCONFIG_PIC=1
 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
+endif
+endif
+
 # libaom doesn't allow in-tree builds
 .aom: aom toolchain.cmake
 	cd $< && mkdir -p aom_build