diff options
| author | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
| commit | 70edf4e2933f9a402de70298352b8775540baf15 (patch) | |
| tree | 779e302a80ce55c37cc071adbda8572fe6ce259f /tools | |
| parent | 5f648881377c13d337c2c648e5747bc66ce92cf2 (diff) | |
fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set)
- jesterKing, could you please check if that's ok?
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 601d3c3000d..a3452f4d593 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -391,12 +391,13 @@ class BlenderEnvironment(SConsEnvironment): # debug or not # CXXFLAGS defaults to CCFLAGS, therefore # we Replace() rather than Append() to CXXFLAGS the first time + lenv.Replace(CXXFLAGS = lenv['CCFLAGS']) if lenv['BF_DEBUG'] or (libname in quickdebug): lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) - lenv.Replace( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) + lenv.Append( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) else: lenv.Append(CCFLAGS = lenv['REL_CFLAGS']) - lenv.Replace(CXXFLAGS = lenv['REL_CCFLAGS']) + lenv.Append(CXXFLAGS = lenv['REL_CCFLAGS']) if lenv['BF_PROFILE']: lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']), CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS'])) |