[xiph-commits] r18705 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2012-11-17 11:15:21 -0800 (Sat, 17 Nov 2012)
New Revision: 18705

Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/build_ffmpeg.sh
Log:
fix build with local ffmpeg version

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2012-11-15 05:49:27 UTC (rev 18704)
+++ trunk/ffmpeg2theora/SConstruct	2012-11-17 19:15:21 UTC (rev 18705)
@@ -161,7 +161,13 @@
     env.Append(CCFLAGS=[
       '-Iffmpeg'
     ])
+    for lib in FFMPEG_LIBS:
+      lib = lib.split(' ')[0]
+      env.Append(LINKFLAGS=[
+        '-Lffmpeg/' + lib
+      ])
 
+
   if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 
     print """
         Could not find %s.

Modified: trunk/ffmpeg2theora/build_ffmpeg.sh
===================================================================
--- trunk/ffmpeg2theora/build_ffmpeg.sh	2012-11-15 05:49:27 UTC (rev 18704)
+++ trunk/ffmpeg2theora/build_ffmpeg.sh	2012-11-17 19:15:21 UTC (rev 18705)
@@ -21,5 +21,5 @@
 uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
 
 #configure and build ffmpeg
-cd $FFMPEG_CO_DIR && ./configure $options && make
+cd $FFMPEG_CO_DIR && ./configure $options && make -j8