Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixing some compile problems with MSVC7.1/scons

Browse Source 
* 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?
This commit is contained in:
Andrea Weikert
2007-09-23 13:52:08 +00:00
parent 5f64888137
commit 70edf4e293
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/Blender.py
View File

@@ -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']))