[vlc-commits] contrib: ffmpeg: Add --arch=x86 if compiling to x86

Edward Wang git at videolan.org
Wed Jul 25 09:30:16 CEST 2012


vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Jul 22 23:54:33 2012 -0400| [21f9e5fb7edb907551759973bd4de284520651c6] | committer: Rafaël Carré

contrib: ffmpeg: Add --arch=x86 if compiling to x86

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/ffmpeg/rules.mak   |    5 +++++
 contrib/src/postproc/rules.mak |    5 +++++
 2 files changed, 10 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index ed6d8e8..a1de6f8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -61,6 +61,11 @@ FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
 endif
 endif
 
+# x86 stuff
+ifeq ($(ARCH),i386)
+FFMPEGCONF += --arch=x86
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 6271b50..b4d1337 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -30,6 +30,11 @@ POSTPROC_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
 endif
 endif
 
+# x86 stuff
+ifeq ($(ARCH),i386)
+POSTPROCCONF += --arch=x86
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 POSTPROCCONF += --arch=$(ARCH) --target-os=darwin



More information about the vlc-commits mailing list