[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17325] trunk/blender: === SCons ===

Nathan Letwory jesterking at letwory.net
Tue Nov 4 23:46:43 CET 2008


Revision: 17325
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17325
Author:   jesterking
Date:     2008-11-04 23:46:43 +0100 (Tue, 04 Nov 2008)

Log Message:
-----------
=== SCons ===

* BlenderLib now expects lists for all compiler related flags (release, profile, debug, warn).
  I changed the default config files, but do double-check your user-config files, esp. if you did
  a full copy of an old default platform config

Modified Paths:
--------------
    trunk/blender/config/darwin-config.py
    trunk/blender/config/linux2-config.py
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/tools/Blender.py

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2008-11-04 22:16:57 UTC (rev 17324)
+++ trunk/blender/config/darwin-config.py	2008-11-04 22:46:43 UTC (rev 17325)
@@ -260,11 +260,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ' -pg -g '
+BF_PROFILE_FLAGS = ['-pg', '-g ']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
 
 BF_BUILDDIR='../build/darwin'
 BF_INSTALLDIR='../install/darwin'

Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py	2008-11-04 22:16:57 UTC (rev 17324)
+++ trunk/blender/config/linux2-config.py	2008-11-04 22:46:43 UTC (rev 17325)
@@ -201,7 +201,7 @@
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
 
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2008-11-04 22:16:57 UTC (rev 17324)
+++ trunk/blender/config/win32-mingw-config.py	2008-11-04 22:46:43 UTC (rev 17325)
@@ -160,7 +160,7 @@
 LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= '-g'
+BF_DEBUG_FLAGS= ['-g']
 
 BF_PROFILE_FLAGS = ['-pg','-g']
 BF_PROFILE = False

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2008-11-04 22:16:57 UTC (rev 17324)
+++ trunk/blender/tools/Blender.py	2008-11-04 22:46:43 UTC (rev 17325)
@@ -417,9 +417,9 @@
             if lenv['WITH_BF_BULLET']:
                     lenv.Append(CPPDEFINES=['WITH_BULLET=1'])
             if lenv['BF_DEBUG'] or (libname in quickdebug):
-                    lenv.Append(CFLAGS = Split(lenv['BF_DEBUG_CFLAGS']))
-                    lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_CCFLAGS']))
-                    lenv.Append(CXXFLAGS = Split(lenv['BF_DEBUG_CXXFLAGS']))
+                    lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
+                    lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])
+                    lenv.Append(CXXFLAGS = lenv['BF_DEBUG_CXXFLAGS'])
             else:
                     lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
                     lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])





More information about the Bf-blender-cvs mailing list