diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-31 02:55:07 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-31 02:55:07 +0300 |
commit | 0bd7934be731aba65680c7fe59f2d89a06391899 (patch) | |
tree | f9921663c42acbf44925ad2bcbf498a35188024f /source | |
parent | dca18fc332f6b4e18e8cf826fd15db3fe321aafc (diff) |
* Minimum SCons version is now 1.0.0
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
- in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
- a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
- I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 4 | ||||
-rw-r--r-- | source/gameengine/Physics/Sumo/SConscript | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index acba9ae2d1d..aaf5ecc910b 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -10,8 +10,8 @@ root_build_dir=env['BF_BUILDDIR'] source_files = ['makesdna.c'] header_files = env.Glob('../*.h') -makesdna_tool = env.Copy() -dna = env.Copy() +makesdna_tool = env.Clone() +dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index be7922efd44..86e8db5919f 100644 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -1,7 +1,6 @@ #!/usr/bin/python Import ('env') -sumoenv = env.Copy() sources = ['SumoPHYCallbackBridge.cpp', 'SumoPhysicsController.cpp', 'SumoPhysicsEnvironment.cpp', @@ -16,7 +15,7 @@ incs =['.', 'Fuzzics/include', '#/intern/moto/include' ] -incs += [sumoenv['BF_SOLID_INC']] +incs += [env['BF_SOLID_INC']] cflags = [] if env['OURPLATFORM']=='win32-vc': |