vlc | branch: master | Felix Paul Kühne <[email protected]> | Wed Oct 17 17:49:45 2012 +0200| [4a8d38843ad4012e2ea0c75e0c485edd6a41ce07] | committer: Felix Paul Kühne
contrib/ffmpeg: fixed compilation for the iOS simulator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4a8d38843ad4012e2ea0c75e0c485edd6a41ce07 --- contrib/src/ffmpeg/rules.mak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 7fcf66e..4b99a1b 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -61,8 +61,10 @@ endif # x86 stuff ifeq ($(ARCH),i386) +ifndef HAVE_DARWIN_OS FFMPEGCONF += --arch=x86 endif +endif # Darwin ifdef HAVE_DARWIN_OS @@ -75,8 +77,10 @@ FFMPEGCONF += --cpu=core2 endif endif ifdef HAVE_IOS +ifeq ($(ARCH),arm) FFMPEGCONF += --enable-pic --as="$(AS)" endif +endif # Linux ifdef HAVE_LINUX _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
