=== SCons ===
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 4 Nov 2008 22:46:43 +0000 (22:46 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 4 Nov 2008 22:46:43 +0000 (22:46 +0000)
* 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

config/darwin-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
tools/Blender.py

index 547d655b531ad93e52c2d6cb3e6fb000cc8814e1..53e45f5233c9ecebc29d3127ea7461567399f788 100644 (file)
@@ -260,11 +260,11 @@ CC_WARN = ['-Wall', '-Wno-long-double']
 ##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'
index ca07bf10ab8836339b862cc1b6e00dda83e04c9c..e890d264682d16d2784c94539ba7c8211072f9f1 100644 (file)
@@ -201,7 +201,7 @@ BF_PROFILE_FLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_FLAGS = ['-g']
 
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'
index c10e9d76cb525cb9e752f00535d233da2d08cf90..251f53a90e2f2ff4bf5c9813f311fe56e7cc9e2a 100644 (file)
@@ -144,7 +144,7 @@ CC_WARN = [ '-Wall' ]
 LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= ''
+BF_DEBUG_FLAGS= []
 
 BF_BUILDDIR = '../build/linuxcross'
 BF_INSTALLDIR='../install/linuxcross'
index 0a4f75e3bccc4fc4d777cc7309e3a3fc9739866d..9313cbc211fcb71bfed318146e5d40c8c461963e 100644 (file)
@@ -155,11 +155,11 @@ LLIBS = 'm stdc++ pthread util'
 ##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/openbsd3'
 BF_INSTALLDIR='../install/openbsd3'
index 2343ce69060ceaaf5228d5b3679f8d3446952d43..7b1295da9412954fe24a730b8265d0eb7fbc1142 100644 (file)
@@ -173,11 +173,11 @@ BF_PROFILE_FLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = ''
+BF_DEBUG_FLAGS = []
 
 BF_BUILDDIR = '../build/sunos5'
 BF_INSTALLDIR='../install/sunos5'
 BF_DOCDIR='../install/doc'
 
 
-PLATFORM_LINKFLAGS = ['']
+PLATFORM_LINKFLAGS = []
index bdeca1ddc9182ab9e43d0b23f00c8d817d65b5df..19e9d1918c63f7369f2b6fd6e6be100c27e8a6d2 100644 (file)
@@ -160,7 +160,7 @@ CC_WARN = [ '-Wall' ]
 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
index 5d123100e3bb9b4d41985bf3601b239dafa9048c..857d5c4d78056b68540ea7a09698a7f2883551b3 100644 (file)
@@ -417,9 +417,9 @@ class BlenderEnvironment(SConsEnvironment):
             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'])