[vlc-commits] contrib: fix cross-compile for x86_64

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <tom at gllm.fr> | Fri Oct 10 06:48:40 2014 +0000| [1b943fd75ab9bfb68b460b2300ffd5c4851f0440] | committer: Jean-Baptiste Kempf

contrib: fix cross-compile for x86_64

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ffmpeg/rules.mak   |    7 +++++++
 contrib/src/gcrypt/rules.mak   |    3 +++
 contrib/src/postproc/rules.mak |    5 +++++
 3 files changed, 15 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index f4b4430..9712478 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -100,6 +100,13 @@ FFMPEGCONF += --arch=x86
 endif
 endif
 
+# x86_64 stuff
+ifeq ($(ARCH),x86_64)
+ifndef HAVE_DARWIN_OS
+FFMPEGCONF += --arch=x86_64
+endif
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0cc1222..4b2cce0 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -40,6 +40,9 @@ ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), x86)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=no
 endif
+ifeq ($(ANDROID_ABI), x86_64)
+GCRYPT_CONF += ac_cv_sys_symbol_underscore=no
+endif
 endif
 
 .gcrypt: libgcrypt
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 42ec148..a132e57 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -50,6 +50,11 @@ ifeq ($(ARCH),i386)
 POSTPROCCONF += --arch=x86
 endif
 
+# x86_64 stuff
+ifeq ($(ARCH),x86_64)
+POSTPROCCONF += --arch=x64_64
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 POSTPROCCONF += --arch=$(ARCH) --target-os=darwin