diff options
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r-- | source/gameengine/GamePlayer/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/SConscript | 119 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/SConscript | 85 |
3 files changed, 101 insertions, 105 deletions
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) |