[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14564] trunk/blender: this commit allow to pass custom compile flags

[JLuc Peuriere]

Revision: 14564
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14564
Author:   lukep
Date:     2008-04-27 20:22:07 +0200 (Sun, 27 Apr 2008)

Log Message:
-----------
this commit allow to pass custom compile flags 
to all ffmpeg related libs

ffmpeg use it own build system and dont respect 
the flags in config.py

define BF_FFMPEG_EXTRA in config.py to pass 
those flags.

I use this on Os X to pass the SDK vars :
-isysroot
-mmacosx-version-min

Modified Paths:
--------------
    trunk/blender/extern/ffmpeg/SConscript
    trunk/blender/extern/x264/SConscript
    trunk/blender/tools/btools.py

Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript	2008-04-27 17:22:57 UTC (rev 14563)
+++ trunk/blender/extern/ffmpeg/SConscript	2008-04-27 18:22:07 UTC (rev 14564)
@@ -1,7 +1,11 @@
 #!/usr/bin/python
 
+
 Import('env')
 
+print env['BF_FFMPEG_EXTRA']
+
+
 all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
 root = "extern/ffmpeg"
 
@@ -10,8 +14,10 @@
 else:
     ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
 
+#--enable-libx264
 extra_variables = { }
 extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ]
+#extra_includes = [ "../xvidcore/src" ]
 
 import sys
 import os
@@ -129,8 +135,12 @@
     if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
     	defs = "HAVE_AV_CONFIG_H  _ISOC9X_SOURCE"
     else :
-	defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
-    cflags = ""
+    	defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
+
+    if env['BF_FFMPEG_EXTRA']:
+        cflags = env['BF_FFMPEG_EXTRA']
+    else :
+        cflags = ""
     
     if "CFLAGS" in vars:
         cflags += " " + vars["CFLAGS"]

Modified: trunk/blender/extern/x264/SConscript
===================================================================
--- trunk/blender/extern/x264/SConscript	2008-04-27 17:22:57 UTC (rev 14563)
+++ trunk/blender/extern/x264/SConscript	2008-04-27 18:22:07 UTC (rev 14564)
@@ -104,7 +104,11 @@
 sources = list(Set(srcs.split()))
 
 defs = ""
-cflags = ""
+
+if x264_env['BF_FFMPEG_EXTRA'] != '':
+    cflags = x264_env['BF_FFMPEG_EXTRA']
+else :
+    cflags = ""
     
 if "CFLAGS" in vars:
     cflags += " " + vars["CFLAGS"]

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-04-27 17:22:57 UTC (rev 14563)
+++ trunk/blender/tools/btools.py	2008-04-27 18:22:07 UTC (rev 14564)
@@ -31,7 +31,7 @@
             'WITH_BF_FMOD',
             'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH',
             'WITH_BF_DDS',
-            'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', 'BF_FFMPEG',  'BF_FFMPEG_INC',
+            'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG',  'BF_FFMPEG_INC',
             'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH',
             'BF_TIFF', 'BF_TIFF_INC',
@@ -174,6 +174,7 @@
         (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')),
         ('BF_FFMPEG', 'FFMPEG base path', ''),
         ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
+        ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''),
 
         ('BF_FFMPEG_INC', 'FFMPEG includes', ''),
         ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),