[xiph-commits] r16742 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2009-11-28 14:04:25 -0800 (Sat, 28 Nov 2009)
New Revision: 16742

Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/get_ffmpeg_svn.sh
Log:
cleanup get_ffmpeg_svn, add m and dl to static build

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2009-11-28 14:06:42 UTC (rev 16741)
+++ trunk/ffmpeg2theora/SConstruct	2009-11-28 22:04:25 UTC (rev 16742)
@@ -178,6 +178,8 @@
     if conf.CheckLib('iconv'):
         env.Append(LIBS=['iconv'])
 
+if env['static']:
+    env.Append(LIBS=['m', 'dl'])
 
 env = conf.Finish()
 

Modified: trunk/ffmpeg2theora/get_ffmpeg_svn.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2009-11-28 14:06:42 UTC (rev 16741)
+++ trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2009-11-28 22:04:25 UTC (rev 16742)
@@ -1,14 +1,14 @@
 #!/bin/sh
 
+common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
+common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-doc"
+
 #optional, if you have those libs installed:
-#extra="--enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
+#extra="--enable-libopencore-amrnb --enable-libopencore-amrwb"
 
 #apt-get install liba52-dev libfaad-dev libgsm1-dev
-#extra="$extra --enable-libfaad --enable-libgsm"
+#extra="$extra--enable-libfaad --enable-libgsm"
 
-common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-doc"
-
 #linux
 options="$common --enable-pthreads $extra"