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

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Sat Apr  7 00:35:48 2018 +0300| [79130a43440a25d05dd6ac1f9b0da778568345bc] | committer: Tristan Matthews

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.

(cherry picked from commit 674f4dac30e179638e52eb3a38aaefefa79da85b)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=79130a43440a25d05dd6ac1f9b0da778568345bc
---

 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 ac4c08aede..14b51c9fe4 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -44,6 +44,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