diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-03-10 23:11:48 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-03-10 23:11:48 +0300 |
| commit | a71c07a0449f0176361085692e4edfab0a11e46a (patch) | |
| tree | bf124431a1c764c8e85da01fdf039eb36ca40f12 /tools/Blender.py | |
| parent | 1c5aa14c5d2b581396596e15ab480f5b1be5d56f (diff) | |
==SCons==
* change CCFLAGS to CXXFLAGS and CFLAGS to CCFLAGS to be better
for SCons
- removed old cruft from ancient system
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 1243fb7d309..f87cbacf142 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -330,16 +330,16 @@ class BlenderEnvironment(SConsEnvironment): if lenv['WITH_BF_GAMEENGINE']: lenv.Append(CPPDEFINES=['GAMEBLENDER=1']) if lenv['BF_DEBUG']: - lenv.Append(CFLAGS = lenv['BF_DEBUG_FLAGS'], CCFLAGS = lenv['BF_DEBUG_FLAGS']) + lenv.Append(CCFLAGS = lenv['BF_DEBUG_FLAGS'], CXXFLAGS = lenv['BF_DEBUG_FLAGS']) else: - lenv.Append(CFLAGS = lenv['REL_CFLAGS'], CCFLAGS = lenv['REL_CCFLAGS']) + lenv.Append(CCFLAGS = lenv['REL_CFLAGS'], CXXFLAGS = lenv['REL_CCFLAGS']) if lenv['BF_PROFILE']: - lenv.Append(CFLAGS = lenv['BF_PROFILE_FLAGS'], CCFLAGS = lenv['BF_PROFILE_FLAGS']) + lenv.Append(CCFLAGS = lenv['BF_PROFILE_FLAGS'], CXXFLAGS = lenv['BF_PROFILE_FLAGS']) if compileflags: - lenv.Append(CFLAGS = compileflags) lenv.Append(CCFLAGS = compileflags) - lenv.Append(CFLAGS = Split(lenv['C_WARN'])) - lenv.Append(CCFLAGS = Split(lenv['CC_WARN'])) + lenv.Append(CXXFLAGS = compileflags) + lenv.Append(CCFLAGS = Split(lenv['C_WARN'])) + lenv.Append(CXXFLAGS = 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: @@ -356,6 +356,8 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS']) + if lenv['BF_PROFILE']: + lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS']) lenv.Append(CPPPATH=includes) lenv.Append(LIBPATH=libpath) lenv.Append(LIBS=libs) |