vlc | branch: master | Felix Paul Kühne <[email protected]> | Wed Mar 21 12:40:07 2012 +0100| [f6c4e22e5cc73f0f0eaae11483f23ec04f0f4392] | committer: Felix Paul Kühne
contrib/ffmpeg: cleaned up compilation for iOS > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6c4e22e5cc73f0f0eaae11483f23ec04f0f4392 --- contrib/src/ffmpeg/rules.mak | 5 ++++- contrib/src/main.mak | 5 +++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 34c86ee..af97865 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -70,7 +70,10 @@ FFMPEGCONF += --cpu=core2 endif endif ifdef HAVE_IOS -FFMPEGCONF += --as="$(TOPSRC)/../extras/tools/gas/gas-preprocessor.pl $(CC)" --enable-pic +FFMPEGCONF += --as="$(AS)" --enable-pic +ifeq ($(ARCH), arm) +FFMPEGCONF += --cpu=cortex-a8 +endif endif # Linux diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 47d4a54..b911491 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -150,6 +150,11 @@ endif ifdef HAVE_IOS CC=xcrun clang CXX=xcrun clang++ +ifeq ($(ARCH), arm) +AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC) +else +AS=xcrun as +endif AR=xcrun ar LD=xcrun ld STRIP=xcrun strip _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
