]> git.sesse.net Git - vlc/commitdiff
contrib/ffmpeg: added support for iOS
authorFelix Paul Kühne <fkuehne@videolan.org>
Tue, 20 Mar 2012 18:53:40 +0000 (19:53 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 21 Mar 2012 10:56:57 +0000 (11:56 +0100)
contrib/src/ffmpeg/rules.mak

index 2097ff8ba89303fea6fc5abaafab38d69ec9b0e7..34c86eefb2d5870316019d07445ad733f43fdc73 100644 (file)
@@ -41,7 +41,10 @@ endif
 #endif
 
 ifdef HAVE_CROSS_COMPILE
-FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
+FFMPEGCONF += --enable-cross-compile
+ifndef HAVE_IOS
+FFMPEGCONF += --cross-prefix=$(HOST)-
+endif
 endif
 
 # ARM stuff
@@ -66,6 +69,9 @@ ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
 endif
+ifdef HAVE_IOS
+FFMPEGCONF += --as="$(TOPSRC)/../extras/tools/gas/gas-preprocessor.pl $(CC)" --enable-pic
+endif
 
 # Linux
 ifdef HAVE_LINUX