diff options
author | Michel Selten <michel@mselten.demon.nl> | 2004-03-01 00:40:48 +0300 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2004-03-01 00:40:48 +0300 |
commit | 70a4ead0ae6f8ffabb1178ec2ed4d1fafa3e232e (patch) | |
tree | 2a81baeb98325e8e74ea4bea96074ec74508f563 /source/gameengine | |
parent | 5998c12c607ea0bfe0d9934f7b9011636ad3936a (diff) |
SCons updates
* Blender static now links. By default this option is disabled on all
platforms. Simply set the option in config.opts to 'true'.
* Added the following flags to config.opts:
- HOST_CC. This is the C compiler for the host platform. This value is the
same as TARGET_CC when not cross compiling.
- HOST_CXX. This is the C++ compiler for the host platform. This value is
the same as TARGET_CXX when not cross compiling.
- TARGET_CC. This is the C compiler for the target platform.
- TARGET_CXX. This is the C++ compiler for the target platform.
- TARGET_AR. This is the linker command for linking libraries.
- PATH This is the standard search path
All SConscript files have been updated to reflect these changes. Now it's
possible to change only the root SConstruct file, and all compiler specific
variables are passed automatically to all SConscript files. Of course, this
does not apply to makesdna because there the host and target platform is
different from all other libraries.
To pass a variable that applies to all platforms, all we now have to do is
set the correct value in library_env
Note: as usual, to get the latest options in the config.opts file, first
remove your version.
Diffstat (limited to 'source/gameengine')
-rwxr-xr-x | source/gameengine/BlenderRoutines/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Converter/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Expressions/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/GameLogic/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Ketsji/KXNetwork/SConscript | 12 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Network/LoopBackNetwork/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Network/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Physics/BlOde/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Physics/Dummy/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Physics/Sumo/SConscript | 16 | ||||
-rwxr-xr-x | source/gameengine/Physics/common/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/Rasterizer/SConscript | 12 | ||||
-rwxr-xr-x | source/gameengine/SceneGraph/SConscript | 12 |
15 files changed, 47 insertions, 137 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index bd6e42d1622..594f516dc77 100755 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -1,13 +1,7 @@ -kx_blenderhook_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -kx_blenderhook_env.Append (CCFLAGS = cflags) -kx_blenderhook_env.Append (CXXFLAGS = cxxflags) -kx_blenderhook_env.Append (CPPDEFINES = defines) +Import ('library_env') + +kx_blenderhook_env = library_env.Copy () source_files = ['KX_BlenderSystem.cpp', 'KX_BlenderRenderTools.cpp', diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 81968e1f864..a488ce8e524 100755 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -1,13 +1,7 @@ -kx_converter_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -kx_converter_env.Append (CCFLAGS = cflags) -kx_converter_env.Append (CXXFLAGS = cxxflags) -kx_converter_env.Append (CPPDEFINES = defines) +Import ('library_env') + +kx_converter_env = library_env.Copy () source_files = ['KX_IpoConvert.cpp', 'KX_ConvertSensors.cpp', diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index 4ee0e322cc5..a5d748e456c 100755 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -1,13 +1,7 @@ -expressions_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -expressions_env.Append (CCFLAGS = cflags) -expressions_env.Append (CXXFLAGS = cxxflags) -expressions_env.Append (CPPDEFINES = defines) +Import ('library_env') + +expressions_env = library_env.Copy () source_files = ['BoolValue.cpp', 'ConstExpr.cpp', diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index 5659b510552..3d086af749d 100755 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -1,13 +1,7 @@ -sca_gamelogic_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -sca_gamelogic_env.Append (CCFLAGS = cflags) -sca_gamelogic_env.Append (CXXFLAGS = cxxflags) -sca_gamelogic_env.Append (CPPDEFINES = defines) +Import ('library_env') + +sca_gamelogic_env = library_env.Copy () source_files = ['SCA_ANDController.cpp', 'SCA_AlwaysEventManager.cpp', diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index 2f4be26cdf5..50d99d5099a 100755 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -1,13 +1,7 @@ -kx_network_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -kx_network_env.Append (CCFLAGS = cflags) -kx_network_env.Append (CXXFLAGS = cxxflags) -kx_network_env.Append (CPPDEFINES = defines) +Import ('library_env') + +kx_network_env = library_env.Copy () source_files = ['KX_NetworkEventManager.cpp', 'KX_NetworkMessageActuator.cpp', diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 489d112ba5e..fddf4762013 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -1,13 +1,7 @@ -ketsji_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -ketsji_env.Append (CCFLAGS = cflags) -ketsji_env.Append (CXXFLAGS = cxxflags) -ketsji_env.Append (CPPDEFINES = defines) +Import ('library_env') + +ketsji_env = library_env.Copy () source_files = ['KX_WorldIpoController.cpp', 'KX_WorldInfo.cpp', diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript index 65157902f48..2233a1820b2 100755 --- a/source/gameengine/Network/LoopBackNetwork/SConscript +++ b/source/gameengine/Network/LoopBackNetwork/SConscript @@ -1,13 +1,7 @@ -ng_loopbacknetwork_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +ng_loopbacknetwork_env = library_env.Copy () source_files = ['NG_LoopBackNetworkDeviceInterface.cpp'] diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript index 15c42cae371..3b050bf779e 100755 --- a/source/gameengine/Network/SConscript +++ b/source/gameengine/Network/SConscript @@ -1,13 +1,7 @@ -ng_network_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +ng_network_env = library_env.Copy () source_files = ['NG_NetworkMessage.cpp', 'NG_NetworkObject.cpp', diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript index 03be5c12b46..ff06d91423f 100755 --- a/source/gameengine/Physics/BlOde/SConscript +++ b/source/gameengine/Physics/BlOde/SConscript @@ -1,13 +1,7 @@ -phy_ode_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -phy_ode_env.Append (CCFLAGS = cflags) -phy_ode_env.Append (CXXFLAGS = cxxflags) -phy_ode_env.Append (CPPDEFINES = defines) +Import ('library_env') + +phy_ode_env = library_env.Copy () source_files = ['OdePhysicsController.cpp', 'OdePhysicsEnvironment.cpp'] diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript index 7d634918b38..80a1e78dd1d 100755 --- a/source/gameengine/Physics/Dummy/SConscript +++ b/source/gameengine/Physics/Dummy/SConscript @@ -1,13 +1,7 @@ -phy_dummy_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +phy_dummy_env = library_env.Copy () source_files = ['DummyPhysicsEnvironment.cpp'] diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index 556b470f60e..c58e98ca4ce 100755 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -1,14 +1,7 @@ -phy_sumo_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +phy_sumo_env = library_env.Copy () source_files = ['SumoPhysicsController.cpp', 'SumoPhysicsEnvironment.cpp', @@ -19,8 +12,9 @@ source_files = ['SumoPhysicsController.cpp', phy_sumo_env.Append (CPPPATH = ['.', '../common', 'Fuzzics/include', - solid_include, '#/intern/moto/include' ]) +phy_sumo_env.Append (CPPPATH = user_options_dict['solid_include']) + 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 016f06b39d3..07a1cea766b 100755 --- a/source/gameengine/Physics/common/SConscript +++ b/source/gameengine/Physics/common/SConscript @@ -1,13 +1,7 @@ -phy_physics_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +phy_physics_env = library_env.Copy () source_files = ['PHY_IMotionState.cpp', 'PHY_IPhysicsController.cpp', diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index 88747440ed7..003ddbf404e 100755 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -1,13 +1,7 @@ -ras_openglrasterizer_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +ras_openglrasterizer_env = library_env.Copy () source_files = ['RAS_CheckVertexArrays.cpp', 'RAS_OpenGLRasterizer.cpp', diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index b27992e6b5c..41cf80df144 100755 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -1,13 +1,7 @@ -ras_rasterizer_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +ras_rasterizer_env = library_env.Copy () source_files = ['RAS_BucketManager.cpp', 'RAS_FramingManager.cpp', diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript index 4e98000a36c..3782d60d828 100755 --- a/source/gameengine/SceneGraph/SConscript +++ b/source/gameengine/SceneGraph/SConscript @@ -1,13 +1,7 @@ -sg_scenegraph_env = Environment() - -# Import the C flags set in the SConstruct file -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) +Import ('library_env') + +sg_scenegraph_env = library_env.Copy () source_files = ['SG_Controller.cpp', 'SG_IObject.cpp', |