diff options
Diffstat (limited to 'source/gameengine')
19 files changed, 257 insertions, 566 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index f586e72ad44..8db4513f841 100755 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -1,55 +1,29 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -kx_blenderhook_env = library_env.Copy () +sources = env.Glob('*.cpp') -source_files = ['KX_BlenderSystem.cpp', - 'KX_BlenderRenderTools.cpp', - 'KX_BlenderMouseDevice.cpp', - 'KX_BlenderKeyboardDevice.cpp', - 'KX_BlenderInputDevice.cpp', - 'KX_BlenderGL.cpp', - 'KX_BlenderCanvas.cpp', - 'BL_KetsjiEmbedStart.cpp'] +incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Converter #source/blender/imbuf' +incs += ' #intern/ghost/include' +incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib' +incs += ' #source/blender/blenkernel #source/blender #source/blender/include' +incs += ' #source/blender/makesdna #source/gameengine/Rasterizer #source/gameengine/GameLogic' +incs += ' #source/gameengine/Expressions #source/gameengine/Network' +incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' +incs += ' #source/gameengine/Physics/Bullet #source/gameengine/Physics/Sumo' +incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork' +incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader' -kx_blenderhook_env.Append (CPPPATH=['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/guardedalloc', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#intern/bmfont', - '#source/gameengine/Converter', - '#source/blender/imbuf', - '#intern/moto/include', - '#source/gameengine/Ketsji', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/gameengine/Rasterizer', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - '#source/gameengine/SceneGraph', - '#source/gameengine/Physics/common', - '#source/gameengine/Physics/Bullet', - '#source/gameengine/Physics/Sumo', - '#source/gameengine/Physics/Sumo/Fuzzics/include', - '#source/gameengine/Network/LoopBackNetwork', - '#intern/SoundSystem', - '#source/blender/misc', - '#source/blender/blenloader' - ]) +incs += ' ' + env['BF_PYTHON_INC'] +incs += ' ' + env['BF_SOLID_INC'] +incs += ' ' + env['BF_BULLET_INC'] +incs += ' ' + env['BF_OPENGL_INC'] -kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) -kx_blenderhook_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) -kx_blenderhook_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) +# TODO: +#if sys.platform=='win32': +# kx_blenderhook_env.Append (CXXFLAGS = ['/GR']) -if sys.platform=='win32': - kx_blenderhook_env.Append (CXXFLAGS = ['/GR']) - -kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files) +env.BlenderLib ( 'KX_blenderhook', sources, Split(incs), [], libtype=['game', 'game2'], priority=[0, 0] ) diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 361aeed4120..82a059ea050 100755 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -1,67 +1,25 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -kx_converter_env = library_env.Copy () +sources = env.Glob('*.cpp') -source_files = ['KX_IpoConvert.cpp', - 'KX_ConvertSensors.cpp', - 'KX_ConvertProperties.cpp', - 'KX_ConvertControllers.cpp', - 'KX_ConvertActuators.cpp', - 'KX_BlenderSceneConverter.cpp', - 'KX_BlenderScalarInterpolator.cpp', - 'BlenderWorldInfo.cpp', - 'BL_SkinMeshObject.cpp', - 'BL_SkinDeformer.cpp', - 'BL_MeshDeformer.cpp', - 'BL_DeformableGameObject.cpp', - 'BL_BlenderDataConversion.cpp', - 'BL_ArmatureObject.cpp', - 'BL_ActionActuator.cpp' - ] +incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' +incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' +incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf' +incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork' +incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender' +incs += ' #source/blender/include #source/blender/makesdna #source/gameengine/Rasterizer' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic' +incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph' +incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde' +incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo' +incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork' +incs += ' #source/blender/misc #source/blender/blenloader' -kx_converter_env.Append (CPPPATH = ['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/guardedalloc', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#intern/bmfont', - '#intern/SoundSystem', - '#intern/SoundSystem/include', - '#intern/SoundSystem/openal', - '#intern/SoundSystem/dummy', - '#intern/SoundSystem/intern', - '#source/gameengine/Converter', - '#source/gameengine/BlenderRoutines', - '#source/blender/imbuf', - '#intern/moto/include', - '#source/gameengine/Ketsji', - '#source/gameengine/Ketsji/KXNetwork', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/gameengine/Rasterizer', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - '#source/gameengine/SceneGraph', - '#source/gameengine/Physics/common', - '#source/gameengine/Physics/Bullet', - '#source/gameengine/Physics/BlOde', - '#source/gameengine/Physics/Dummy', - '#source/gameengine/Physics/Sumo', - '#source/gameengine/Physics/Sumo/Fuzzics/include', - '#source/gameengine/Network/LoopBackNetwork', - '#source/blender/misc', - '#source/blender/blenloader' - ]) +incs += ' ' + env['BF_PYTHON_INC'] +incs += ' ' + env['BF_SOLID_INC'] +incs += ' ' + env['BF_BULLET_INC'] -kx_converter_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -kx_converter_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) -kx_converter_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) - -kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files) +env.BlenderLib ( 'KX_converter', sources, Split(incs), [], libtype='game', priority=5 ) diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index 212381cc034..2fd3bf6fe75 100755 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -1,34 +1,9 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -expressions_env = library_env.Copy () +sources = env.Glob('*.cpp') -source_files = ['BoolValue.cpp', - 'ConstExpr.cpp', - 'EmptyValue.cpp', - 'ErrorValue.cpp', - 'EXP_C-Api.cpp', - 'Expression.cpp', - 'FloatValue.cpp', - 'IdentifierExpr.cpp', - 'IfExpr.cpp', - 'InputParser.cpp', - 'IntValue.cpp', - 'KX_HashedPtr.cpp', - 'ListValue.cpp', - 'Operator1Expr.cpp', - 'Operator2Expr.cpp', - 'PyObjectPlus.cpp', - 'StringValue.cpp', - 'Value.cpp', - 'VectorValue.cpp'] +incs ='. #source/kernel/gen_system #intern/string #intern/moto/include' +incs += ' ' + env['BF_PYTHON_INC'] -expressions_env.Append (CPPPATH = ['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/moto/include']) - -expressions_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) - -expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files) +env.BlenderLib ( 'blender_expressions', sources, Split(incs), [], libtype='game', priority = 45 ) diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index 928667ea4c1..126c84eecb2 100755 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -1,48 +1,12 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -sca_gamelogic_env = library_env.Copy () +sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp') -source_files = ['SCA_ANDController.cpp', - 'SCA_AlwaysEventManager.cpp', - 'SCA_AlwaysSensor.cpp', - 'SCA_EventManager.cpp', - 'SCA_ExpressionController.cpp', - 'SCA_IActuator.cpp', - 'SCA_IController.cpp', - 'SCA_IInputDevice.cpp', - 'SCA_ILogicBrick.cpp', - 'SCA_IObject.cpp', - 'SCA_IScene.cpp', - 'SCA_ISensor.cpp', - 'SCA_JoystickManager.cpp', - 'SCA_JoystickSensor.cpp', - 'SCA_KeyboardManager.cpp', - 'SCA_KeyboardSensor.cpp', - 'SCA_LogicManager.cpp', - 'SCA_MouseManager.cpp', - 'SCA_MouseSensor.cpp', - 'SCA_ORController.cpp', - 'SCA_PropertyActuator.cpp', - 'SCA_PropertyEventManager.cpp', - 'SCA_PropertySensor.cpp', - 'SCA_PythonController.cpp', - 'SCA_RandomActuator.cpp', - 'SCA_RandomEventManager.cpp', - 'SCA_RandomNumberGenerator.cpp', - 'SCA_RandomSensor.cpp', - 'SCA_TimeEventManager.cpp', - 'Joystick/SCA_Joystick.cpp', - 'Joystick/SCA_JoystickEvents.cpp'] +incs = '. #/source/kernel/gen_system #/intern/string' +incs += ' #/source/gameengine/Expressions #/intern/moto/include' -sca_gamelogic_env.Append (CPPPATH=['.', - '#/source/kernel/gen_system', - '#/intern/string', - '#/source/gameengine/Expressions', - '#/intern/moto/include']) +incs += ' ' + env['BF_PYTHON_INC'] +incs += ' ' + env['BF_SDL_INC'] -sca_gamelogic_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -sca_gamelogic_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) - -sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files) +env.BlenderLib ( 'SCA_GameLogic', sources, Split(incs), [], libtype='game', priority=30 ) diff --git a/source/gameengine/GamePlayer/SConscript b/source/gameengine/GamePlayer/SConscript index 08a9a7ace5f..0b140bba8e7 100644 --- a/source/gameengine/GamePlayer/SConscript +++ b/source/gameengine/GamePlayer/SConscript @@ -1,3 +1,3 @@ #!/usr/bin/python SConscript(['common/SConscript', - 'ghost/SConscript'])
\ No newline at end of file + 'ghost/SConscript']) diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 4983160d94b..d229e8488a2 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -1,73 +1,72 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -gp_common_env = library_env.Copy() source_files = ['bmfont.cpp', - 'GPC_Canvas.cpp', - 'GPC_Engine.cpp', - 'GPC_KeyboardDevice.cpp', - 'GPC_MouseDevice.cpp', - 'GPC_PolygonMaterial.cpp', - 'GPC_RawImage.cpp', - 'GPC_RawLoadDotBlendArray.cpp', - 'GPC_RawLogoArrays.cpp', - 'GPC_RenderTools.cpp', - 'GPC_System.cpp'] + 'GPC_Canvas.cpp', + 'GPC_Engine.cpp', + 'GPC_KeyboardDevice.cpp', + 'GPC_MouseDevice.cpp', + 'GPC_PolygonMaterial.cpp', + 'GPC_RawImage.cpp', + 'GPC_RawLoadDotBlendArray.cpp', + 'GPC_RawLogoArrays.cpp', + 'GPC_RenderTools.cpp', + 'GPC_System.cpp'] -gp_common_env.Append( CPPPATH = ['.', - '#intern/string', - '#intern/ghost', - '#intern/guardedalloc', - '#intern/bmfont', - '#intern/moto/include', - '#intern/SoundSystem', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#source/kernel/gen_system', - '#source/kernel/gen_messaging', - '#source/gameengine/Converter', - '#source/blender/imbuf', - '#source/gameengine/Ketsji', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/gameengine/Rasterizer', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - '#source/gameengine/SceneGraph', - '#source/gameengine/Physics/common', - '#source/gameengine/Physics/Sumo', - '#source/gameengine/Physics/Sumo/Fuzzics/include', - '#source/gameengine/Network/LoopBackNetwork', - '#source/gameengine/GamePlayer/ghost', - '#source/blender/misc', - '#source/blender/blenloader']) - +incs = ['.', + '#intern/string', + '#intern/ghost', + '#intern/guardedalloc', + '#intern/bmfont', + '#intern/moto/include', + '#intern/SoundSystem', + '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', + '#source/kernel/gen_system', + '#source/kernel/gen_messaging', + '#source/gameengine/Converter', + '#source/blender/imbuf', + '#source/gameengine/Ketsji', + '#source/blender/blenlib', + '#source/blender/blenkernel', + '#source/blender', + '#source/blender/include', + '#source/blender/makesdna', + '#source/gameengine/Rasterizer', + '#source/gameengine/GameLogic', + '#source/gameengine/Expressions', + '#source/gameengine/Network', + '#source/gameengine/SceneGraph', + '#source/gameengine/Physics/common', + '#source/gameengine/Physics/Sumo', + '#source/gameengine/Physics/Sumo/Fuzzics/include', + '#source/gameengine/Network/LoopBackNetwork', + '#source/gameengine/GamePlayer/ghost', + '#source/blender/misc', + '#source/blender/blenloader'] + #This is all plugin stuff! #if sys.platform=='win32': -# source_files += ['windows/GPW_Canvas.cpp', -# 'windows/GPW_Engine.cpp', -# 'windows/GPW_KeyboardDevice.cpp', -# 'windows/GPW_System.cpp'] -# gp_common_env.Append ( CPPPATH = ['windows']) +# source_files += ['windows/GPW_Canvas.cpp', +# 'windows/GPW_Engine.cpp', +# 'windows/GPW_KeyboardDevice.cpp', +# 'windows/GPW_System.cpp'] +# gp_common_env.Append ( CPPPATH = ['windows']) #elif sys.platform=='linux2' or sys.platform=='linux-i386': -# source_files += ['unix/GPU_Canvas.cpp', -# 'unix/GPU_Engine.cpp', -# 'unix/GPU_KeyboardDevice.cpp', -# 'unix/GPU_System.cpp'] -# gp_common_env.Append ( CPPPATH = ['unix']) +# source_files += ['unix/GPU_Canvas.cpp', +# 'unix/GPU_Engine.cpp', +# 'unix/GPU_KeyboardDevice.cpp', +# 'unix/GPU_System.cpp'] +# gp_common_env.Append ( CPPPATH = ['unix']) -gp_common_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -gp_common_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) -gp_common_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE']) -gp_common_env.Append (CPPPATH = user_options_dict['Z_INCLUDE']) +incs += Split(env['BF_PYTHON_INC']) +incs += Split(env['BF_SOLID_INC']) +incs += Split(env['BF_PNG_INC']) +incs += Split(env['BF_ZLIB_INC']) +cflags=[] if sys.platform=='win32': - gp_common_env.Append (CXXFLAGS = ['/GR']) + cflags = ['/GR'] -gp_common_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPC_common', source=source_files) +env.BlenderLib (libname='GPC_common', sources=source_files, includes=incs, defines = [], libtype=['player'], priority=[5], compileflags=cflags) diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index f3dbf2aeed5..0d56a02a4a3 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -1,52 +1,49 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') - -gp_ghost_env = library_env.Copy() +Import ('env') source_files = ['GPG_Application.cpp', - 'GPG_Canvas.cpp', - 'GPG_ghost.cpp', - 'GPG_KeyboardDevice.cpp', - 'GPG_System.cpp'] - -gp_ghost_env.Append( CPPPATH = ['.', - '#intern/string', - '#intern/ghost', - '#intern/guardedalloc', - '#intern/bmfont', - '#intern/moto/include', - '#intern/SoundSystem', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#source/kernel/gen_system', - '#source/kernel/gen_messaging', - '#source/gameengine/Converter', - '#source/blender/imbuf', - '#source/gameengine/Ketsji', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender/readblenfile', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/gameengine/Rasterizer', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - '#source/gameengine/SceneGraph', - '#source/gameengine/Physics/common', - '#source/gameengine/Physics/Sumo', - '#source/gameengine/Physics/Sumo/Fuzzics/include', - '#source/gameengine/Network/LoopBackNetwork', - '#source/gameengine/GamePlayer/common', - '#source/blender/misc', - '#source/blender/blenloader']) + 'GPG_Canvas.cpp', + 'GPG_ghost.cpp', + 'GPG_KeyboardDevice.cpp', + 'GPG_System.cpp'] -gp_ghost_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -gp_ghost_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) +incs = ['.', + '#intern/string', + '#intern/ghost', + '#intern/guardedalloc', + '#intern/bmfont', + '#intern/moto/include', + '#intern/SoundSystem', + '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', + '#source/kernel/gen_system', + '#source/kernel/gen_messaging', + '#source/gameengine/Converter', + '#source/blender/imbuf', + '#source/gameengine/Ketsji', + '#source/blender/blenlib', + '#source/blender/blenkernel', + '#source/blender/readblenfile', + '#source/blender', + '#source/blender/include', + '#source/blender/makesdna', + '#source/gameengine/Rasterizer', + '#source/gameengine/GameLogic', + '#source/gameengine/Expressions', + '#source/gameengine/Network', + '#source/gameengine/SceneGraph', + '#source/gameengine/Physics/common', + '#source/gameengine/Physics/Sumo', + '#source/gameengine/Physics/Sumo/Fuzzics/include', + '#source/gameengine/Network/LoopBackNetwork', + '#source/gameengine/GamePlayer/common', + '#source/blender/misc', + '#source/blender/blenloader'] +incs += Split(env['BF_PYTHON_INC']) +incs += Split(env['BF_SOLID_INC']) +cflags = [] if sys.platform=='win32': - gp_ghost_env.Append (CXXFLAGS = ['/GR']) + cflags = ['/GR'] -gp_ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPG_ghost', source=source_files)
\ No newline at end of file +env.BlenderLib (libname='GPG_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags) diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index 820255a5ff4..7c0f3f1ab28 100755 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -1,25 +1,12 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -kx_network_env = library_env.Copy () +sources = env.Glob('*.cpp') -source_files = ['KX_NetworkEventManager.cpp', - 'KX_NetworkMessageActuator.cpp', - 'KX_NetworkMessageSensor.cpp', - 'KX_NetworkObjectActuator.cpp', - 'KX_NetworkObjectSensor.cpp' - ] +incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Ketsji' +incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions' +incs += ' #source/gameengine/Network' -kx_network_env.Append (CPPPATH = ['.', - '#source/kernel/gen_system', - '#intern/string', - '#source/gameengine/Ketsji', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - ]) +incs += ' ' + env['BF_PYTHON_INC'] -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) +env.BlenderLib ( 'KX_network', Split(sources), Split(incs), defines=[],libtype='game2', priority=5 ) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 26c982dc4f9..375f2679e21 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -1,126 +1,33 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') - -ketsji_env = library_env.Copy () - -source_files = ['BL_Shader.cpp', - 'BL_Material.cpp', - 'BL_Texture.cpp', - 'KX_WorldIpoController.cpp', - 'KX_WorldInfo.cpp', - 'KX_VisibilityActuator.cpp', - 'KX_VertexProxy.cpp', - 'KX_TrackToActuator.cpp', - 'KX_TouchSensor.cpp', - 'KX_TouchEventManager.cpp', - 'KX_TimeLogger.cpp', - 'KX_TimeCategoryLogger.cpp', - 'KX_SoundActuator.cpp', - 'KX_SG_NodeRelationships.cpp', - 'KX_SG_BoneParentNodeRelationship.cpp', - 'KX_SceneActuator.cpp', - 'KX_Scene.cpp', - 'KX_ScalingInterpolator.cpp', - 'KX_ScalarInterpolator.cpp', - 'KX_SCA_ReplaceMeshActuator.cpp', - 'KX_SCA_EndObjectActuator.cpp', - 'KX_SCA_AddObjectActuator.cpp', - 'KX_RaySensor.cpp', - 'KX_RayEventManager.cpp', - 'KX_RayCast.cpp', - 'KX_RadarSensor.cpp', - 'KX_PyMath.cpp', - 'KX_PythonInit.cpp', - 'KX_PyConstraintBinding.cpp', - 'KX_PositionInterpolator.cpp', - 'KX_PolygonMaterial.cpp', - 'KX_PhysicsObjectWrapper.cpp', - 'KX_OrientationInterpolator.cpp', - 'KX_ObjectActuator.cpp', - 'KX_ObColorIpoSGController.cpp', - 'KX_NearSensor.cpp', - 'KX_MouseFocusSensor.cpp', - 'KX_MotionState.cpp', - 'KX_MeshProxy.cpp', - 'KX_LightIpoSGController.cpp', - 'KX_Light.cpp', - 'KX_KetsjiEngine.cpp', - 'KX_IpoActuator.cpp', - 'KX_IPO_SGController.cpp', - 'KX_IPhysicsController.cpp', - 'KX_GameObject.cpp', - 'KX_GameActuator.cpp', - 'KX_EmptyObject.cpp', - 'KX_ConvertPhysicsObjects.cpp', - 'KX_ConstraintWrapper.cpp', - 'KX_ConstraintActuator.cpp', - 'KX_CDActuator.cpp', - 'KX_CameraIpoSGController.cpp', - 'KX_CameraActuator.cpp', - 'KX_Camera.cpp', - 'KX_BulletPhysicsController.cpp', - 'KX_BlenderMaterial.cpp', - 'KX_MaterialIpoController.cpp', - 'KX_VehicleWrapper.cpp', - ] - -if user_options_dict['USE_PHYSICS'] == 'solid': - source_files += ['KX_SumoPhysicsController.cpp'] - ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) - -if user_options_dict['USE_PHYSICS'] == 'ode': - source_files += ['KX_OdePhysicsController.cpp'] - ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) - - -ketsji_env.Append (CPPPATH = ['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/guardedalloc', - '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', - '#intern/bmfont', - '#intern/SoundSystem', - '#intern/SoundSystem/include', - '#intern/SoundSystem/openal', - '#intern/SoundSystem/dummy', - '#intern/SoundSystem/intern', - '#source/gameengine/Converter', - '#source/gameengine/BlenderRoutines', - '#source/blender/imbuf', - '#intern/moto/include', - '#source/gameengine/Ketsji', - '#source/gameengine/Ketsji/KXNetwork', - '#source/blender/blenlib', - '#source/blender/blenkernel', - '#source/blender', - '#source/blender/include', - '#source/blender/makesdna', - '#source/blender/python', - '#source/gameengine/Rasterizer', - '#source/gameengine/GameLogic', - '#source/gameengine/Expressions', - '#source/gameengine/Network', - '#source/gameengine/SceneGraph', - '#source/gameengine/Physics/common', - '#source/gameengine/Physics/Bullet', - '#source/gameengine/Physics/BlOde', - '#source/gameengine/Physics/Dummy', - '#source/gameengine/Physics/Sumo', - '#source/gameengine/Physics/Sumo/include', - '#source/gameengine/Physics/Sumo/Fuzzics/include', - '#source/gameengine/Network/LoopBackNetwork', - '#source/blender/misc', - '#source/blender/blenloader' - ]) - -if sys.platform == 'win32': - ketsji_env.Append (CXXFLAGS = ['/GR']) - ketsji_env.Append ( CCFLAGS =['/Ox']) -ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) -ketsji_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) -ketsji_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) - -ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) +Import ('env') + +sources = env.Glob('*.cpp') + +incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' +incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' +incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' +incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib' +incs += ' #source/blender/blenkernel #source/blender #source/blender/include' +incs += ' #source/blender/makesdna #source/blender/python #source/gameengine/Rasterizer' +incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' +incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #source/gameengine/Physics/Bullet' +incs += ' #source/gameengine/Physics/BlOde #source/gameengine/Physics/Dummy' +incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include' +incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork' +incs += ' #source/blender/misc #source/blender/blenloader' + +#TODO: +#if sys.platform == 'win32': +# ketsji_env.Append (CXXFLAGS = ['/GR']) +# ketsji_env.Append ( CCFLAGS =['/Ox']) + +incs += ' ' + env['BF_SOLID_INC'] +incs += ' ' + env['BF_PYTHON_INC'] +incs += ' ' + env['BF_SDL_INC'] +incs += ' ' + env['BF_BULLET_INC'] + +env.BlenderLib ( 'KX_ketsji', sources, Split(incs), [], libtype='game', priority=25 ) diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript index 333dff4d987..292abc8e7a9 100755 --- a/source/gameengine/Network/LoopBackNetwork/SConscript +++ b/source/gameengine/Network/LoopBackNetwork/SConscript @@ -1,15 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -ng_loopbacknetwork_env = library_env.Copy () +sources = 'NG_LoopBackNetworkDeviceInterface.cpp' -source_files = ['NG_LoopBackNetworkDeviceInterface.cpp'] +incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network' -ng_loopbacknetwork_env.Append (CPPPATH=['.', - '#source/kernel/gen_system', - '#intern/string', - '#source/gameengine/Network', - ]) - -ng_loopbacknetwork_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_loopbacknetwork', source=source_files) +env.BlenderLib ( 'NG_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype='game2', priority=25 ) diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript index 489bea7a970..998e6f36af3 100755 --- a/source/gameengine/Network/SConscript +++ b/source/gameengine/Network/SConscript @@ -1,17 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -ng_network_env = library_env.Copy () +sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp' -source_files = ['NG_NetworkMessage.cpp', - 'NG_NetworkObject.cpp', - 'NG_NetworkScene.cpp'] +incs = '. #source/kernel/gen_system #intern/string #intern/moto/include' -ng_network_env.Append (CPPPATH=['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/moto/include' - ]) - -ng_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_network', source=source_files) +env.BlenderLib ( 'NG_network', sources, Split(incs), [], libtype='game2', priority=15 ) diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript index 8d82f346757..b9d7bed8880 100644 --- a/source/gameengine/Physics/Bullet/SConscript +++ b/source/gameengine/Physics/Bullet/SConscript @@ -1,22 +1,16 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_bullet_env = library_env.Copy () +sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp' -source_files = ['CcdPhysicsEnvironment.cpp', - 'CcdPhysicsController.cpp' - ] +incs = '. ../common' -phy_bullet_env.Append (CPPPATH=['.', - '../common']) +incs += ' ' + env['BF_BULLET_INC'] -phy_bullet_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) +#TODO: +#if sys.platform=='win32': +# phy_bullet_env.Append (CXXFLAGS = ['/GR']) +# phy_bullet_env.Append (CCFLAGS =['/O2']) - -if sys.platform=='win32': - phy_bullet_env.Append (CXXFLAGS = ['/GR']) - phy_bullet_env.Append (CCFLAGS =['/O2']) - -phy_bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Bullet', source=source_files) +env.BlenderLib ( 'PHY_Bullet', Split(sources), Split(incs), [], libtype='game', priority=15 ) diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript index b5a642d4f9a..781e88e456f 100755 --- a/source/gameengine/Physics/Dummy/SConscript +++ b/source/gameengine/Physics/Dummy/SConscript @@ -1,13 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_dummy_env = library_env.Copy () +sources = 'DummyPhysicsEnvironment.cpp' -source_files = ['DummyPhysicsEnvironment.cpp'] +incs = '. ../common' -phy_dummy_env.Append (CPPPATH = ['.', - '../common' - ]) - -phy_dummy_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Dummy', source=source_files) +env.BlenderLib ( 'PHY_Dummy', Split(sources), Split(incs), [], libtype='game', priority=10 ) diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index b502a1ec616..7407aec469d 100755 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -1,11 +1,8 @@ #!/usr/bin/python -import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_sumo_env = library_env.Copy () - -source_files = ['SumoPHYCallbackBridge.cpp', +sumoenv = env.Copy() +sources = ['SumoPHYCallbackBridge.cpp', 'SumoPhysicsController.cpp', 'SumoPhysicsEnvironment.cpp', 'Fuzzics/src/SM_FhObject.cpp', @@ -14,16 +11,16 @@ source_files = ['SumoPHYCallbackBridge.cpp', 'Fuzzics/src/SM_MotionState.cpp' ] -phy_sumo_env.Append (CPPPATH = ['.', - '../common', - 'Fuzzics/include', - '#/intern/moto/include' - ]) - -phy_sumo_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) +incs =['.', + '../common', + 'Fuzzics/include', + '#/intern/moto/include' + ] +incs += [sumoenv['BF_SOLID_INC']] -if sys.platform=='win32': - phy_sumo_env.Append (CXXFLAGS = ['/GR']) - phy_sumo_env.Append ( CCFLAGS =['/O1']) +if sumoenv['PLATFORM']=='win32': + sumoenv.Append (CXXFLAGS = ['/GR']) + sumoenv.Append ( CCFLAGS =['/O1']) -phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) +#env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) +env.BlenderLib ( 'PHY_Sumo', sources, incs, [], libtype='game2', priority=30 ) diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript index fbde29861e6..b6cb78742ab 100755 --- a/source/gameengine/Physics/common/SConscript +++ b/source/gameengine/Physics/common/SConscript @@ -1,16 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_physics_env = library_env.Copy () +sources = 'PHY_IMotionState.cpp PHY_IPhysicsController.cpp PHY_IPhysicsEnvironment.cpp' -source_files = ['PHY_IMotionState.cpp', - 'PHY_IPhysicsController.cpp', - 'PHY_IPhysicsEnvironment.cpp'] +incs = '. ../Dummy #intern/moto/include' -phy_physics_env.Append (CPPPATH = ['.', - '../Dummy', - '#intern/moto/include' - ]) - -phy_physics_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Physics', source=source_files) +env.BlenderLib ( 'PHY_Physics', Split(sources), Split(incs), [], libtype=['game', 'game2'], priority=[20, 35] ) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index 6baebd0fabc..56183c88946 100755 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -1,19 +1,9 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -ras_openglrasterizer_env = library_env.Copy () +sources = env.Glob('*.cpp') #'RAS_GLExtensionManager.cpp RAS_OpenGLRasterizer.cpp RAS_VAOpenGLRasterizer.cpp' -source_files = ['RAS_GLExtensionManager.cpp', - 'RAS_OpenGLRasterizer.cpp', - 'RAS_VAOpenGLRasterizer.cpp'] +incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer' +incs += ' ' + env['BF_OPENGL_INC'] -ras_openglrasterizer_env.Append (CPPPATH=['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/moto/include', - '#source/gameengine/Rasterizer' - ]) -ras_openglrasterizer_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) - -ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files) +env.BlenderLib ( 'RAS_OpenGLRasterizer', Split(sources), Split(incs), [], libtype='game', priority=40 ) diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index 358edb6c9de..1b833c8d7ee 100755 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -1,27 +1,13 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -ras_rasterizer_env = library_env.Copy () +sources = env.Glob('*.cpp') -source_files = ['RAS_BucketManager.cpp', - 'RAS_FramingManager.cpp', - 'RAS_IPolygonMaterial.cpp', - 'RAS_IRenderTools.cpp', - 'RAS_MaterialBucket.cpp', - 'RAS_MeshObject.cpp', - 'RAS_Polygon.cpp', - 'RAS_TexVert.cpp', - 'RAS_texmatrix.cpp'] +incs = '. #source/kernel/gen_system #intern/string #intern/moto/include' -ras_rasterizer_env.Append (CPPPATH=['.', - '#source/kernel/gen_system', - '#intern/string', - '#intern/moto/include' - ]) +#TODO: +#if sys.platform=='win32': +# ras_rasterizer_env.Append ( CCFLAGS =['/Ox']) -if sys.platform=='win32': - ras_rasterizer_env.Append ( CCFLAGS =['/Ox']) - -ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files) +env.BlenderLib ( 'RAS_rasterizer', sources, Split(incs), [], libtype='game', priority=35 ) diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index ca4283944b5..c2750d19706 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -1,5 +1,5 @@ #!/usr/bin/python -Import ('user_options_dict') +Import ('env') SConscript(['BlenderRoutines/SConscript', 'Converter/SConscript', @@ -14,12 +14,14 @@ SConscript(['BlenderRoutines/SConscript', 'Rasterizer/SConscript', 'Rasterizer/RAS_OpenGLRasterizer/SConscript', 'SceneGraph/SConscript', - 'Physics/Bullet/SConscript']) + 'Physics/Bullet/SConscript', + 'Physics/Sumo/SConscript' + ]) -if user_options_dict['BUILD_BLENDER_PLAYER']: - SConscript(['GamePlayer/SConscript']) +if env['WITH_BF_PLAYER']: + SConscript(['GamePlayer/SConscript']) -if user_options_dict['USE_PHYSICS'] == 'solid': - SConscript(['Physics/Sumo/SConscript']) -elif user_options_dict['USE_PHYSICS'] == 'ode': - SConscript(['Physics/BlOde/SConscript']) +#if user_options_dict['USE_PHYSICS'] == 'solid': +# SConscript(['Physics/Sumo/SConscript']) +#elif user_options_dict['USE_PHYSICS'] == 'ode': +# SConscript(['Physics/BlOde/SConscript']) diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript index 2905684d50e..d34f41eb2af 100755 --- a/source/gameengine/SceneGraph/SConscript +++ b/source/gameengine/SceneGraph/SConscript @@ -1,19 +1,9 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -sg_scenegraph_env = library_env.Copy () +sources = env.Glob('*.cpp') #'SG_BBox.cpp SG_Controller.cpp SG_IObject.cpp SG_Node.cpp SG_Spatial.cpp SG_Tree.cpp' -source_files = ['SG_BBox.cpp', - 'SG_Controller.cpp', - 'SG_IObject.cpp', - 'SG_Node.cpp', - 'SG_Spatial.cpp', - 'SG_Tree.cpp'] +incs = '. #intern/moto/include' -sg_scenegraph_env.Append (CPPPATH=['.', - '#intern/moto/include' - ]) - -sg_scenegraph_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SG_SceneGraph', source=source_files) +env.BlenderLib ( 'SG_SceneGraph', sources, Split(incs), [], libtype='game', priority=50 ) |