From 9330e553e88fe77b3a08cfac3a13046031b58e56 Mon Sep 17 00:00:00 2001 From: Michel Selten Date: Sun, 15 Feb 2004 19:25:32 +0000 Subject: 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. --- source/gameengine/BlenderRoutines/SConscript | 6 ++++-- source/gameengine/Converter/SConscript | 3 ++- source/gameengine/Expressions/SConscript | 3 ++- source/gameengine/GameLogic/SConscript | 3 ++- source/gameengine/Ketsji/KXNetwork/SConscript | 3 ++- source/gameengine/Ketsji/SConscript | 9 ++++----- source/gameengine/Network/LoopBackNetwork/SConscript | 3 ++- source/gameengine/Network/SConscript | 3 ++- source/gameengine/Physics/BlOde/SConscript | 3 ++- source/gameengine/Physics/Dummy/SConscript | 3 ++- source/gameengine/Physics/Sumo/SConscript | 3 ++- source/gameengine/Physics/common/SConscript | 3 ++- .../Rasterizer/RAS_OpenGLRasterizer/SConscript | 3 ++- source/gameengine/Rasterizer/SConscript | 3 ++- source/gameengine/SConscript | 17 ++++++++--------- source/gameengine/SceneGraph/SConscript | 3 ++- 16 files changed, 42 insertions(+), 29 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 2116f9fec3b..0e39cf02107 100755 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -5,6 +5,8 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('python_include') +Import ('solid_include') +Import ('user_options_dict') kx_blenderhook_env.Append (CCFLAGS = cflags) kx_blenderhook_env.Append (CXXFLAGS = cxxflags) kx_blenderhook_env.Append (CPPDEFINES = defines) @@ -46,7 +48,7 @@ kx_blenderhook_env.Append (CPPPATH=['.', '#intern/SoundSystem', '#source/blender/misc', '#source/blender/blenloader', - '#../lib/windows/solid/include', + solid_include, ]) -kx_blenderhook_env.Library (target='#/lib/KX_blenderhook', source=source_files) +kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files) diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 9567844c8dd..795274ca345 100755 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -6,6 +6,7 @@ Import ('cxxflags') Import ('defines') Import ('solid_include') Import ('python_include') +Import ('user_options_dict') kx_converter_env.Append (CCFLAGS = cflags) kx_converter_env.Append (CXXFLAGS = cxxflags) kx_converter_env.Append (CPPDEFINES = defines) @@ -66,4 +67,4 @@ kx_converter_env.Append (CPPPATH = ['.', solid_include ]) -kx_converter_env.Library (target='#/lib/KX_converter', source=source_files) +kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files) diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index c750bcd3e1a..5a5205bd3bc 100755 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -5,6 +5,7 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('python_include') +Import ('user_options_dict') expressions_env.Append (CCFLAGS = cflags) expressions_env.Append (CXXFLAGS = cxxflags) expressions_env.Append (CPPDEFINES = defines) @@ -34,4 +35,4 @@ expressions_env.Append (CPPPATH = ['.', '#intern/string', python_include]) -expressions_env.Library (target='#/lib/blender_expressions', source=source_files) +expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files) diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index c61b708ec43..33de774b314 100755 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -5,6 +5,7 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('python_include') +Import ('user_options_dict') sca_gamelogic_env.Append (CCFLAGS = cflags) sca_gamelogic_env.Append (CXXFLAGS = cxxflags) sca_gamelogic_env.Append (CPPDEFINES = defines) @@ -45,4 +46,4 @@ sca_gamelogic_env.Append (CPPPATH=['.', python_include, ]) -sca_gamelogic_env.Library (target='#/lib/SCA_GameLogic', source=source_files) +sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files) 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) diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript index a6cd3c435fa..65157902f48 100755 --- a/source/gameengine/Network/LoopBackNetwork/SConscript +++ b/source/gameengine/Network/LoopBackNetwork/SConscript @@ -4,6 +4,7 @@ ng_loopbacknetwork_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') ng_loopbacknetwork_env.Append (CCFLAGS = cflags) ng_loopbacknetwork_env.Append (CXXFLAGS = cxxflags) ng_loopbacknetwork_env.Append (CPPDEFINES = defines) @@ -16,4 +17,4 @@ ng_loopbacknetwork_env.Append (CPPPATH=['.', '#source/gameengine/Network', ]) -ng_loopbacknetwork_env.Library (target='#/lib/NG_loopbacknetwork', source=source_files) +ng_loopbacknetwork_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_loopbacknetwork', source=source_files) diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript index 443803f9ce3..15c42cae371 100755 --- a/source/gameengine/Network/SConscript +++ b/source/gameengine/Network/SConscript @@ -4,6 +4,7 @@ ng_network_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') ng_network_env.Append (CCFLAGS = cflags) ng_network_env.Append (CXXFLAGS = cxxflags) ng_network_env.Append (CPPDEFINES = defines) @@ -17,4 +18,4 @@ ng_network_env.Append (CPPPATH=['.', '#intern/string' ]) -ng_network_env.Library (target='#/lib/NG_network', source=source_files) +ng_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_network', source=source_files) diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript index 43ddbd31c06..0d5804cf5ac 100755 --- a/source/gameengine/Physics/BlOde/SConscript +++ b/source/gameengine/Physics/BlOde/SConscript @@ -5,6 +5,7 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('ode_include') +Import ('user_options_dict') phy_ode_env.Append (CCFLAGS = cflags) phy_ode_env.Append (CXXFLAGS = cxxflags) phy_ode_env.Append (CPPDEFINES = defines) @@ -17,4 +18,4 @@ phy_ode_env.Append (CPPPATH=['.', ode_include ]) -phy_ode_env.Library (target='#/lib/PHY_Ode', source=source_files) +phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files) diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript index 746c16bb9f3..7d634918b38 100755 --- a/source/gameengine/Physics/Dummy/SConscript +++ b/source/gameengine/Physics/Dummy/SConscript @@ -4,6 +4,7 @@ phy_dummy_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') phy_dummy_env.Append (CCFLAGS = cflags) phy_dummy_env.Append (CXXFLAGS = cxxflags) phy_dummy_env.Append (CPPDEFINES = defines) @@ -14,4 +15,4 @@ phy_dummy_env.Append (CPPPATH = ['.', '../common' ]) -phy_dummy_env.Library (target='#/lib/PHY_Dummy', source=source_files) +phy_dummy_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Dummy', source=source_files) diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index a59e66cd850..556b470f60e 100755 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -5,6 +5,7 @@ Import ('cflags') Import ('cxxflags') Import ('defines') Import ('solid_include') +Import ('user_options_dict') phy_sumo_env.Append (CCFLAGS = cflags) phy_sumo_env.Append (CXXFLAGS = cxxflags) phy_sumo_env.Append (CPPDEFINES = defines) @@ -22,4 +23,4 @@ phy_sumo_env.Append (CPPPATH = ['.', '#/intern/moto/include' ]) -phy_sumo_env.Library (target='#/lib/PHY_Sumo', source=source_files) +phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript index 81cc93fa3c1..016f06b39d3 100755 --- a/source/gameengine/Physics/common/SConscript +++ b/source/gameengine/Physics/common/SConscript @@ -4,6 +4,7 @@ phy_physics_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') phy_physics_env.Append (CCFLAGS = cflags) phy_physics_env.Append (CXXFLAGS = cxxflags) phy_physics_env.Append (CPPDEFINES = defines) @@ -16,4 +17,4 @@ phy_physics_env.Append (CPPPATH = ['.', '../Dummy' ]) -phy_physics_env.Library (target='#/lib/PHY_Physics', source=source_files) +phy_physics_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Physics', source=source_files) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index d1dd79b55e8..88747440ed7 100755 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -4,6 +4,7 @@ ras_openglrasterizer_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') ras_openglrasterizer_env.Append (CCFLAGS = cflags) ras_openglrasterizer_env.Append (CXXFLAGS = cxxflags) ras_openglrasterizer_env.Append (CPPDEFINES = defines) @@ -19,4 +20,4 @@ ras_openglrasterizer_env.Append (CPPPATH=['.', '#source/gameengine/Rasterizer' ]) -ras_openglrasterizer_env.Library (target='#/lib/RAS_OpenGLRasterizer', source=source_files) +ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files) diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index 5d8b31d53ec..b27992e6b5c 100755 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -4,6 +4,7 @@ ras_rasterizer_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') ras_rasterizer_env.Append (CCFLAGS = cflags) ras_rasterizer_env.Append (CXXFLAGS = cxxflags) ras_rasterizer_env.Append (CPPDEFINES = defines) @@ -24,4 +25,4 @@ ras_rasterizer_env.Append (CPPPATH=['.', '#intern/moto/include' ]) -ras_rasterizer_env.Library (target='#/lib/RAS_rasterizer', source=source_files) +ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files) diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index 9ae0df1a8aa..1984c121b00 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -1,22 +1,21 @@ -Import ('use_ode') -Import ('use_sumo') +Import ('user_options_dict') -SConscript(['Ketsji/SConscript', - 'Ketsji/KXNetwork/SConscript', - 'Expressions/SConscript', - 'BlenderRoutines/SConscript', +SConscript(['BlenderRoutines/SConscript', 'Converter/SConscript', + 'Expressions/SConscript', + 'GameLogic/SConscript', + 'Ketsji/SConscript', + 'Ketsji/KXNetwork/SConscript', 'Network/SConscript', 'Network/LoopBackNetwork/SConscript', - 'GameLogic/SConscript', 'Physics/common/SConscript', 'Physics/Dummy/SConscript', 'Rasterizer/SConscript', 'Rasterizer/RAS_OpenGLRasterizer/SConscript', 'SceneGraph/SConscript']) -if use_sumo == 'true': +if user_options_dict['USE_PHYSICS'] == 'solid': SConscript(['Physics/Sumo/SConscript']) -if use_ode == 'true': +if user_options_dict['USE_PHYSICS'] == 'ode': SConscript(['Physics/BlOde/SConscript']) diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript index 6f51bef7989..4e98000a36c 100755 --- a/source/gameengine/SceneGraph/SConscript +++ b/source/gameengine/SceneGraph/SConscript @@ -4,6 +4,7 @@ sg_scenegraph_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') sg_scenegraph_env.Append (CCFLAGS = cflags) sg_scenegraph_env.Append (CXXFLAGS = cxxflags) sg_scenegraph_env.Append (CPPDEFINES = defines) @@ -17,4 +18,4 @@ sg_scenegraph_env.Append (CPPPATH=['.', '#intern/moto/include' ]) -sg_scenegraph_env.Library (target='#/lib/SG_SceneGraph', source=source_files) +sg_scenegraph_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SG_SceneGraph', source=source_files) -- cgit v1.2.3