[vlc-commits] contrib: x264: Fix building for windows on arm

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Tue Dec 19 11:05:47 2017 +0200| [be70cc11e17ddab1dddd10b739b773271c69c356] | committer: Martin Storsjö

contrib: x264: Fix building for windows on arm

(cherry picked from commit 1374a33c83ead6eced5a6dc67bb860b74361dcda)

edited:
- The patch enclosed in the original commit is no longer necessary.

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

 contrib/src/x264/rules.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index cb61370355..da1e935829 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -35,6 +35,9 @@ ifndef HAVE_WIN32
 X264CONF += --enable-pic
 else
 X264CONF += --enable-win32thread
+ifeq ($(ARCH), arm)
+X264_AS = AS="./tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- $(CC) -mimplicit-it=always"
+endif
 endif
 ifdef HAVE_CROSS_COMPILE
 X264CONF += --cross-prefix="$(HOST)-"
@@ -89,7 +92,7 @@ x262: x262-git.tar.gz .sum-x262
 
 .x264: x264
 	$(REQUIRE_GPL)
-	cd $< && $(HOSTVARS) ./configure $(X264CONF)
+	cd $< && $(HOSTVARS) $(X264_AS) ./configure $(X264CONF)
 	cd $< && $(MAKE) install
 	touch $@