From 70edf4e2933f9a402de70298352b8775540baf15 Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Sun, 23 Sep 2007 13:52:08 +0000 Subject: 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? --- tools/Blender.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') 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'])) -- cgit v1.2.3