[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12249] trunk/blender/extern/ffmpeg/ SConscript: == FFMPEG ==

[Joe Eagar]

Can there still be an option to use prebuilt libraries?  I use a unix 
shell myself to build stuff, but not everyone who uses scons does as far 
as I know.

Joe

Peter Schlaile wrote:
> Revision: 12249
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12249
> Author:   schlaile
> Date:     2007-10-10 15:43:42 +0200 (Wed, 10 Oct 2007)
>
> Log Message:
> -----------
> == FFMPEG ==
>
> Made some changes in configure switches to make Carsten with mingw a little bit
> happier...
>
> Modified Paths:
> --------------
>     trunk/blender/extern/ffmpeg/SConscript
>
> Modified: trunk/blender/extern/ffmpeg/SConscript
> ===================================================================
> --- trunk/blender/extern/ffmpeg/SConscript	2007-10-10 10:22:43 UTC (rev 12248)
> +++ trunk/blender/extern/ffmpeg/SConscript	2007-10-10 13:43:42 UTC (rev 12249)
> @@ -1,8 +1,15 @@
>  #!/usr/bin/python
>  
> +Import('env')
> +
>  all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
>  root = "extern/ffmpeg"
>  
> +if env['OURPLATFORM'] == 'win32-mingw':
> +    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads"
> +else:
> +    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack"
> +
>  import sys
>  import os
>  import re
> @@ -10,8 +17,6 @@
>  
>  from sets import Set
>  
> -Import('env')
> -
>  ff_env = env.Copy();
>  ff_env.Replace(CCFLAGS = '')
>  ff_env.Replace(BF_DEBUG_FLAGS = '')
> @@ -85,7 +90,7 @@
>  
>  if not os.path.isfile(root + "/config.mak"):
>      os.chdir(root);
> -    os.system('sh configure --disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads')
> +    os.system('sh configure ' + ffmpeg_switches)
>      os.chdir("../..");
>  else:
>      print "(skipped, config.mak already exists)"
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
>