[vlc-commits] contrib: vpx: fix android x86_64 build

Thomas Guillem git at videolan.org
Mon Aug 29 13:36:24 CEST 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug 25 18:11:27 2016 +0200| [91b7c306eb937a47a9721f8248656d2bb0d65abb] | committer: Thomas Guillem

contrib: vpx: fix android x86_64 build

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

 contrib/src/vpx/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 0710470..0a8c04b 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -114,6 +114,10 @@ ifdef HAVE_ANDROID
 # vpx configure.sh overrides our sysroot and it looks for it itself, and
 # uses that path to look for the compiler (which we already know)
 VPX_CONF += --sdk-path=$(shell dirname $(shell which $(HOST)-clang))
+# broken text relocations
+ifeq ($(ARCH),x86_64)
+VPX_CONF += --disable-mmx
+endif
 endif
 
 ifndef WITH_OPTIMIZATION



More information about the vlc-commits mailing list