diff options
author | Michel Selten <michel@mselten.demon.nl> | 2004-02-21 18:13:15 +0300 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2004-02-21 18:13:15 +0300 |
commit | 9e238d385d34bdbc09d2643fd2a1575886e024b3 (patch) | |
tree | 21238f7650ee8a1a52444036c99d93786f7fb274 /source/gameengine | |
parent | 05bff7f93823d484ca237340a5b6af546a7e99c3 (diff) |
SCons updates
* Almost all library settings are now available in the config.opts user option
file.
* All platform variables had to be updated to make this possible. Things are
much clearer now, but I only was able to test the changes on Linux. I've
tried to update all other platform variables, but things are most likely to
be broken. Please contact me how to resolve the issues.
Note: Before running scons, remove your existing config.opts file to get all
new options.
Diffstat (limited to 'source/gameengine')
-rwxr-xr-x | source/gameengine/BlenderRoutines/SConscript | 9 | ||||
-rwxr-xr-x | source/gameengine/Converter/SConscript | 9 | ||||
-rwxr-xr-x | source/gameengine/Expressions/SConscript | 6 | ||||
-rwxr-xr-x | source/gameengine/GameLogic/SConscript | 7 | ||||
-rwxr-xr-x | source/gameengine/Ketsji/KXNetwork/SConscript | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 9 |
6 files changed, 20 insertions, 24 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 0e39cf02107..bd6e42d1622 100755 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -4,8 +4,6 @@ kx_blenderhook_env = Environment() 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) @@ -26,7 +24,6 @@ kx_blenderhook_env.Append (CPPPATH=['.', '#intern/string', '#intern/guardedalloc', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - python_include, '#intern/bmfont', '#source/gameengine/Converter', '#source/blender/imbuf', @@ -47,8 +44,10 @@ kx_blenderhook_env.Append (CPPPATH=['.', '#source/gameengine/Network/LoopBackNetwork', '#intern/SoundSystem', '#source/blender/misc', - '#source/blender/blenloader', - solid_include, + '#source/blender/blenloader' ]) +kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) +kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) + 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 795274ca345..81968e1f864 100755 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -4,8 +4,6 @@ kx_converter_env = Environment() Import ('cflags') 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) @@ -33,7 +31,6 @@ kx_converter_env.Append (CPPPATH = ['.', '#intern/string', '#intern/guardedalloc', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - python_include, '#intern/bmfont', '#intern/SoundSystem', '#intern/SoundSystem/include', @@ -63,8 +60,10 @@ kx_converter_env.Append (CPPPATH = ['.', '#source/gameengine/Physics/Sumo/Fuzzics/include', '#source/gameengine/Network/LoopBackNetwork', '#source/blender/misc', - '#source/blender/blenloader', - solid_include + '#source/blender/blenloader' ]) +kx_converter_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) +kx_converter_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) + 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 5a5205bd3bc..4ee0e322cc5 100755 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -4,7 +4,6 @@ expressions_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') -Import ('python_include') Import ('user_options_dict') expressions_env.Append (CCFLAGS = cflags) expressions_env.Append (CXXFLAGS = cxxflags) @@ -32,7 +31,8 @@ source_files = ['BoolValue.cpp', expressions_env.Append (CPPPATH = ['.', '#source/kernel/gen_system', - '#intern/string', - python_include]) + '#intern/string']) + +expressions_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) 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 33de774b314..5659b510552 100755 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -4,7 +4,6 @@ sca_gamelogic_env = Environment() 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) @@ -42,8 +41,8 @@ sca_gamelogic_env.Append (CPPPATH=['.', '#/source/kernel/gen_system', '#/intern/string', '#/source/gameengine/Expressions', - '#/intern/moto/include', - python_include, - ]) + '#/intern/moto/include']) + +sca_gamelogic_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) 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 43dc4998c36..2f4be26cdf5 100755 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -4,7 +4,6 @@ kx_network_env = Environment() 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) @@ -20,11 +19,12 @@ source_files = ['KX_NetworkEventManager.cpp', kx_network_env.Append (CPPPATH = ['.', '#source/kernel/gen_system', '#intern/string', - python_include, '#source/gameengine/Ketsji', '#source/gameengine/GameLogic', '#source/gameengine/Expressions', '#source/gameengine/Network', ]) +kx_network_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) + 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 f035f5f4b9e..489d112ba5e 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -4,8 +4,6 @@ ketsji_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') -Import ('python_include') -Import ('solid_include') Import ('user_options_dict') ketsji_env.Append (CCFLAGS = cflags) ketsji_env.Append (CXXFLAGS = cxxflags) @@ -63,7 +61,7 @@ source_files = ['KX_WorldIpoController.cpp', if user_options_dict['USE_PHYSICS'] == 'solid': source_files += ['KX_SumoPhysicsController.cpp'] - ketsji_env.Append (CPPPATH = [solid_include]) + ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) if user_options_dict['USE_PHYSICS'] == 'ode': source_files += ['KX_OdePhysicsController.cpp'] @@ -103,8 +101,9 @@ ketsji_env.Append (CPPPATH = ['.', '#source/gameengine/Physics/Sumo/Fuzzics/include', '#source/gameengine/Network/LoopBackNetwork', '#source/blender/misc', - '#source/blender/blenloader', - python_include + '#source/blender/blenloader' ]) +ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) + ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) |