[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14598] trunk/blender: Add BF_X264_CONFIG and BF_XVIDCORE_CONFIG flags to scons, to allow passing

[Ken Hughes]

Revision: 14598
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14598
Author:   khughes
Date:     2008-04-28 18:14:31 +0200 (Mon, 28 Apr 2008)

Log Message:
-----------
Add BF_X264_CONFIG and BF_XVIDCORE_CONFIG flags to scons, to allow passing
configuration info for cross-compiling to ./configure scripts.  Also let
makesdna use PLATFORM_LINKFLAGS.

Modified Paths:
--------------
    trunk/blender/extern/x264/SConscript
    trunk/blender/extern/xvidcore/SConscript
    trunk/blender/source/blender/makesdna/intern/SConscript
    trunk/blender/tools/btools.py

Modified: trunk/blender/extern/x264/SConscript
===================================================================
--- trunk/blender/extern/x264/SConscript	2008-04-28 16:09:17 UTC (rev 14597)
+++ trunk/blender/extern/x264/SConscript	2008-04-28 16:14:31 UTC (rev 14598)
@@ -84,7 +84,11 @@
 
 if not os.path.isfile(root + "/config.mak"):
     os.chdir(root);
-    os.system("sh -c './configure'")
+    code = -1
+    if x264_env['BF_X264_CONFIG'] != '':
+        code = os.system("sh -c './configure %s'"%x264_env['BF_X264_CONFIG'])
+    if code != 0:
+        os.system("sh -c './configure'")
     os.chdir("../..");
 else:
     print "(skipped, config.mak already exists)"

Modified: trunk/blender/extern/xvidcore/SConscript
===================================================================
--- trunk/blender/extern/xvidcore/SConscript	2008-04-28 16:09:17 UTC (rev 14597)
+++ trunk/blender/extern/xvidcore/SConscript	2008-04-28 16:14:31 UTC (rev 14598)
@@ -91,7 +91,12 @@
 
 if not os.path.isfile(buildroot + "/platform.inc"):
     os.chdir(buildroot);
-    os.system("sh -c './configure'")
+    code = -1
+    if xvidcore_env['BF_XVIDCORE_CONFIG'] != '':
+        code = os.system("sh -c './configure %s'"%xvidcore_env['BF_XVIDCORE_CONFIG'])
+    if code != 0:
+        os.system("sh -c './configure'")
+  
     os.chdir("../../../..");
 else:
     print "(skipped, build/generic/platform.inc already exists)"

Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript	2008-04-28 16:09:17 UTC (rev 14597)
+++ trunk/blender/source/blender/makesdna/intern/SConscript	2008-04-28 16:14:31 UTC (rev 14598)
@@ -25,6 +25,7 @@
     makesdna_tool.Append (CCFLAGS = cflags)
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib')
+makesdna_tool.Append (LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 if env['BF_PROFILE']:
 	makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
 

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-04-28 16:09:17 UTC (rev 14597)
+++ trunk/blender/tools/btools.py	2008-04-28 16:14:31 UTC (rev 14598)
@@ -63,14 +63,17 @@
             'WITHOUT_BF_INSTALL',
             'WITH_BF_OPENMP',
             'WITHOUT_BF_INSTALL',
-            'BF_FANCY', 'BF_QUIET'
+            'BF_FANCY', 'BF_QUIET',
+            'BF_X264_CONFIG',
+            'BF_XVIDCORE_CONFIG',
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
             'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
             'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE',
             'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG',
-            'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', "BF_QUICKDEBUG", "BF_LISTDEBUG", 'LCGDIR']
+            'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
+            'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG']
 
     all_list = opts_list + arg_list
     okdict = {}
@@ -315,6 +318,9 @@
         (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')),
         (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')),
 
+        ('BF_X264_CONFIG', 'configuration flags for x264', ''),
+        ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
+
     ) # end of opts.AddOptions()
 
     return localopts