diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-02-16 02:26:00 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-02-16 02:26:00 +0300 |
commit | c3d74547befb549cb3104d39797519a32afb2f35 (patch) | |
tree | d279dc7b892b6e039b891c9ef041a64940752921 /tools | |
parent | 915baae622233e89ae721ef2562732564e58fb27 (diff) |
SCons:
* giving compileflags, cc_compileflags and cxx_compileflags to BlenderLib() now actually overrides any other setting (so there's no unclarity when ie. conflicting options are being specified in REL_CFLAGS et al). These are set after either release or debug flags, but before any *_WARN flags (so those stay maintained).
* add cxx_compileflags for GE parts on win32-vc to have better performance.
* NOTE: if platform maintainers (OSX and Linux) could check and do the same for their systems. Not vital, but probably very, very much welcomed by GE users.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Blender.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 1c54e98f177..9c978fccf49 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -434,11 +434,11 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS']) lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS']) if compileflags: - lenv.Append(CFLAGS = compileflags) + lenv.Replace(CFLAGS = compileflags) if cc_compileflags: - lenv.Append(CCFLAGS = cc_compileflags) + lenv.Replace(CCFLAGS = cc_compileflags) if cxx_compileflags: - lenv.Append(CXXFLAGS = cxx_compileflags) + lenv.Replace(CXXFLAGS = cxx_compileflags) lenv.Append(CFLAGS = lenv['C_WARN']) lenv.Append(CCFLAGS = lenv['CC_WARN']) lenv.Append(CXXFLAGS = lenv['CXX_WARN']) |