(contrib) Do not use --std=c99 for ffmpeg on contrib when crosscompiling to win32.
authorJean-Paul Saman <jpsaman@videolan.org>
Mon, 13 Oct 2008 10:20:41 +0000 (12:20 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Tue, 14 Oct 2008 13:07:43 +0000 (15:07 +0200)
extras/contrib/src/Makefile
extras/contrib/src/Patches/ffmpeg-svn-win32.patch [new file with mode: 0644]

index b114476..c43931b 100644 (file)
@@ -1083,6 +1083,9 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef HAVE_WIN32
+       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
+endif
 ifdef NO_TEXT_RELOCATION
        echo "Broken LD. Fix your tools."
        exit -1
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
new file mode 100644 (file)
index 0000000..8d05681
--- /dev/null
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure  (revision 15611)
++++ configure  (working copy)
+@@ -1149,7 +1149,7 @@
+ TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
+ check_cflags -fasm
+-check_cflags -std=c99
++# check_cflags -std=c99
+ case "$arch" in
+     i386|i486|i586|i686|i86pc|BePC)