diff options
author | Michel Selten <michel@mselten.demon.nl> | 2004-02-15 22:25:32 +0300 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2004-02-15 22:25:32 +0300 |
commit | 9330e553e88fe77b3a08cfac3a13046031b58e56 (patch) | |
tree | 69b9155aad185dc347bef0dcffaf8c538980fb72 /source/gameengine/Ketsji | |
parent | 2fbf2b3775405566eb5906da2c7223eb9b626427 (diff) |
SCons updates
* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
source/gameengine/SConscript.
All libraries are now sorted alphabetically. This has no impact on the build
process.
Diffstat (limited to 'source/gameengine/Ketsji')
-rwxr-xr-x | source/gameengine/Ketsji/KXNetwork/SConscript | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index 61e31bb0f66..43dc4998c36 100755 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -5,6 +5,7 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('python_include') +Import ('user_options_dict') kx_network_env.Append (CCFLAGS = cflags) kx_network_env.Append (CXXFLAGS = cxxflags) kx_network_env.Append (CPPDEFINES = defines) @@ -26,4 +27,4 @@ kx_network_env.Append (CPPPATH = ['.', '#source/gameengine/Network', ]) -kx_network_env.Library (target='#/lib/KX_network', source=source_files) +kx_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_network', source=source_files) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 75eff210137..f035f5f4b9e 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -4,10 +4,9 @@ ketsji_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') -Import ('use_sumo') -Import ('use_ode') Import ('python_include') Import ('solid_include') +Import ('user_options_dict') ketsji_env.Append (CCFLAGS = cflags) ketsji_env.Append (CXXFLAGS = cxxflags) ketsji_env.Append (CPPDEFINES = defines) @@ -62,11 +61,11 @@ source_files = ['KX_WorldIpoController.cpp', 'KX_Camera.cpp' ] -if use_sumo == 'true': +if user_options_dict['USE_PHYSICS'] == 'solid': source_files += ['KX_SumoPhysicsController.cpp'] ketsji_env.Append (CPPPATH = [solid_include]) -if use_ode == 'true': +if user_options_dict['USE_PHYSICS'] == 'ode': source_files += ['KX_OdePhysicsController.cpp'] ketsji_env.Append (CPPPATH = ['.', @@ -108,4 +107,4 @@ ketsji_env.Append (CPPPATH = ['.', python_include ]) -ketsji_env.Library (target='#/lib/KX_ketsji', source=source_files) +ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) |