[vlc-commits] contrib: improve build rules for ffmpeg and libpostproc for iOS in case arch != arm

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Mar 24 20:20:18 2012 +0100| [e25946ed87a820afc202bed1069db3b49d833341] | committer: Felix Paul Kühne

contrib: improve build rules for ffmpeg and libpostproc for iOS in case arch != arm

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

 contrib/src/ffmpeg/rules.mak   |    4 +---
 contrib/src/postproc/rules.mak |    7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index af97865..6d8d638 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -60,8 +60,6 @@ endif
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
 FFMPEG_CFLAGS += -DHAVE_LRINTF
-endif
-ifdef HAVE_MACOSX
 ifneq ($(findstring $(ARCH),i386 x86_64),)
 FFMPEGCONF += --enable-memalign-hack
 endif
@@ -70,7 +68,7 @@ FFMPEGCONF += --cpu=core2
 endif
 endif
 ifdef HAVE_IOS
-FFMPEGCONF += --as="$(AS)" --enable-pic
+FFMPEGCONF += --enable-pic --as="$(AS)" --disable-decoder=snow
 ifeq ($(ARCH), arm)
 FFMPEGCONF += --cpu=cortex-a8
 endif
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 5f18208..6271b50 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -31,11 +31,14 @@ endif
 endif
 
 # Darwin
-ifdef HAVE_MACOSX
+ifdef HAVE_DARWIN_OS
 POSTPROCCONF += --arch=$(ARCH) --target-os=darwin
 endif
 ifdef HAVE_IOS
-POSTPROCCONF += --cpu=cortex-a8 --as="$(AS)" --target-os=darwin
+POSTPROCCONF += --as="$(AS)"
+ifeq ($(ARCH),arm)
+POSTPROCCONF += --cpu=cortex-a8
+endif
 endif
 ifeq ($(ARCH),x86_64)
 POSTPROCCONF += --cpu=core2