==SCons==
authorNathan Letwory <nathan@letworyinteractive.com>
Sat, 4 Feb 2006 15:52:55 +0000 (15:52 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sat, 4 Feb 2006 15:52:55 +0000 (15:52 +0000)
* If you set C_WARN=[] and CC_WARN=[] in your user-config.py, no complaints
  whatsoever should show. Otherwise a lot of warnings are shown.

config/linux2-config.py
tools/Blender.py

index 6d6ffe7725749378837b8a20f4e316ee3c5e19a8..18aea1e497c03fafde259819dbdb56b8e15c38b9 100644 (file)
@@ -114,8 +114,8 @@ CFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
 
 CPPFLAGS = ['-DXP_UNIX']
 CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-REL_CFLAGS = ' -O2 '
-REL_CCFLAGS = ' -O2 '
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
 ##BF_DEPEND = 'true'
 ##
 ##AR = ar
index 11c5251a899747a3171c33ab172fc183ff04c3d7..2c761ca4a18d21ff7066ec8a423cd223f7d912a9 100644 (file)
@@ -274,14 +274,16 @@ class BlenderEnvironment(SConsEnvironment):
             if lenv['WITH_BF_GAMEENGINE']:
                     lenv.Append(CPPDEFINES=['GAMEBLENDER=1'])
             if lenv['BF_DEBUG']:
-                    lenv.Append(CCFLAGS = lenv['BF_DEBUG_FLAGS'], CXXFLAGS = lenv['BF_DEBUG_FLAGS'])
+                    lenv.Append(CFLAGS = lenv['BF_DEBUG_FLAGS'], CCFLAGS = lenv['BF_DEBUG_FLAGS'])
             else:
-                    lenv.Append(CCFLAGS = lenv['REL_CFLAGS'], CXXFLAGS = lenv['REL_CCFLAGS'])
+                    lenv.Append(CFLAGS = lenv['REL_CFLAGS'], CCFLAGS = lenv['REL_CCFLAGS'])
             if lenv['BF_PROFILE']:
-                    lenv.Append(CCFLAGS = lenv['BF_PROFILE_FLAGS'], CXXFLAGS = lenv['BF_PROFILE_FLAGS'])
+                    lenv.Append(CFLAGS = lenv['BF_PROFILE_FLAGS'], CCFLAGS = lenv['BF_PROFILE_FLAGS'])
             if compileflags:
+                lenv.Append(CFLAGS = compileflags)
                 lenv.Append(CCFLAGS = compileflags)
-                lenv.Append(CXXFLAGS = compileflags)
+            lenv.Append(CFLAGS = Split(lenv['C_WARN']))
+            lenv.Append(CCFLAGS = Split(lenv['CC_WARN']))
             lib = lenv.Library(target= '#'+root_build_dir+'lib/'+libname, source=sources)
             SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
         else: