[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32582] trunk/blender/build_files/scons: Set defaults for compile and link flags to lists.

Nathan Letwory nathan at letworyinteractive.com
Tue Oct 19 07:21:29 CEST 2010


Revision: 32582
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32582
Author:   jesterking
Date:     2010-10-19 07:21:28 +0200 (Tue, 19 Oct 2010)

Log Message:
-----------
Set defaults for compile and link flags to lists.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/aix4-config.py
    trunk/blender/build_files/scons/config/irix6-config.py
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/config/aix4-config.py
===================================================================
--- trunk/blender/build_files/scons/config/aix4-config.py	2010-10-19 05:00:36 UTC (rev 32581)
+++ trunk/blender/build_files/scons/config/aix4-config.py	2010-10-19 05:21:28 UTC (rev 32582)
@@ -190,7 +190,7 @@
 BF_PROFILE = 'false'
 
 BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR = '../build/aix4'
 BF_INSTALLDIR='../install/aix4'

Modified: trunk/blender/build_files/scons/config/irix6-config.py
===================================================================
--- trunk/blender/build_files/scons/config/irix6-config.py	2010-10-19 05:00:36 UTC (rev 32581)
+++ trunk/blender/build_files/scons/config/irix6-config.py	2010-10-19 05:21:28 UTC (rev 32582)
@@ -171,9 +171,9 @@
 ##ARFLAGS = ruv
 ##ARFLAGSQUIET = ru
 ##
-C_WARN = '-no_prelink -ptused'
+C_WARN = ['-no_prelink', '-ptused']
 
-CC_WARN = '-no_prelink -ptused'
+CC_WARN = ['-no_prelink', '-ptused']
 
 ##FIX_STUBS_WARNINGS = -Wno-unused
 
@@ -185,7 +185,7 @@
 BF_PROFILE = 'false'
 
 BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR = '../build/irix6'
 BF_INSTALLDIR='../install/irix6'

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2010-10-19 05:00:36 UTC (rev 32581)
+++ trunk/blender/build_files/scons/tools/btools.py	2010-10-19 05:21:28 UTC (rev 32582)
@@ -387,33 +387,33 @@
         (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
         (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
 
-        ('CFLAGS', 'C only flags', ''),
-        ('CCFLAGS', 'Generic C and C++ flags', ''),
-        ('CXXFLAGS', 'C++ only flags', ''),
-        ('BGE_CXXFLAGS', 'C++ only flags for BGE', ''),
-        ('CPPFLAGS', 'Defines', ''),
-        ('REL_CFLAGS', 'C only release flags', ''),
-        ('REL_CCFLAGS', 'Generic C and C++ release flags', ''),
-        ('REL_CXXFLAGS', 'C++ only release flags', ''),
+        ('CFLAGS', 'C only flags', []),
+        ('CCFLAGS', 'Generic C and C++ flags', []),
+        ('CXXFLAGS', 'C++ only flags', []),
+        ('BGE_CXXFLAGS', 'C++ only flags for BGE', []),
+        ('CPPFLAGS', 'Defines', []),
+        ('REL_CFLAGS', 'C only release flags', []),
+        ('REL_CCFLAGS', 'Generic C and C++ release flags', []),
+        ('REL_CXXFLAGS', 'C++ only release flags', []),
 
-        ('C_WARN', 'C warning flags', ''),
-        ('CC_WARN', 'Generic C and C++ warning flags', ''),
-        ('CXX_WARN', 'C++ only warning flags', ''),
+        ('C_WARN', 'C warning flags', []),
+        ('CC_WARN', 'Generic C and C++ warning flags', []),
+        ('CXX_WARN', 'C++ only warning flags', []),
 
-        ('LLIBS', 'Platform libs', ''),
-        ('PLATFORM_LINKFLAGS', 'Platform linkflags', ''),
+        ('LLIBS', 'Platform libs', []),
+        ('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
         ('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
 
         (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
-        ('BF_PROFILE_CFLAGS', 'C only profiling flags', ''),
-        ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', ''),
-        ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', ''),
-        ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', ''),
+        ('BF_PROFILE_CFLAGS', 'C only profiling flags', []),
+        ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', []),
+        ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', []),
+        ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', []),
 
         (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)),
-        ('BF_DEBUG_CFLAGS', 'C only debug flags', ''),
-        ('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', ''),
-        ('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', ''),
+        ('BF_DEBUG_CFLAGS', 'C only debug flags', []),
+        ('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', []),
+        ('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', []),
 
         (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', False)),
 





More information about the Bf-blender-cvs mailing list