Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2006-02-04 18:52:55 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2006-02-04 18:52:55 +0300
commite48ed941a0b5d846d837e24740151f710b7fa067 (patch)
treec851d3dda209c79e896e24a5a1f4b2677a04306d /tools
parentc0234bd9ecb0c7ab1065dfe4ebaf779fe8d99426 (diff)
==SCons==
* 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.
Diffstat (limited to 'tools')
-rw-r--r--tools/Blender.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/Blender.py b/tools/Blender.py
index 11c5251a899..2c761ca4a18 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -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: