Added preliminary support for GamePlayer building with SCons. GPG_ghost and GPC_common are now being built. These will be built by setting BUILD_BLENDER_PLAYER to true in config.opts. BUILD_GAMEENGINE must be set to true, too.

5 files changed, 151 insertions, 23 deletions

diff --git a/SConstruct b/SConstruct
index 77c8c351370..0be6f0fffb6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -893,30 +893,35 @@ if user_options_dict['USE_INTERNATIONAL'] == 1:
     link_env.Append (LIBS=user_options_dict['FREETYPE_LIBRARY'])
 if user_options_dict['USE_QUICKTIME'] == 1:
     link_env.Append (LIBS=['blender_quicktime'])
+
 if user_options_dict['BUILD_GAMEENGINE'] == 1:
-    link_env.Append (LIBS=['KX_blenderhook',
-                           'KX_converter',
-                           'PHY_Dummy',
-                           'PHY_Physics',
-                           'KX_ketsji',
-                           'SCA_GameLogic',
-                           'RAS_rasterizer',
-                           'RAS_OpenGLRasterizer',
-                           'blender_expressions',
-                           'SG_SceneGraph',
-                           'blender_MT',
-                           'KX_blenderhook',
-                           'KX_network',
-                           'blender_kernel',
-                           'NG_network',
-                           'NG_loopbacknetwork'])
-    if user_options_dict['USE_PHYSICS'] == 'solid':
-        link_env.Append (LIBS=['PHY_Sumo', 'PHY_Physics', 'blender_MT', 'extern_solid', 'extern_qhull'])
-    else:
-        link_env.Append (LIBS=['PHY_Ode',
-                               'PHY_Physics'])
-        link_env.Append (LIBS=user_options_dict['ODE_LIBRARY'])
-        link_env.Append (LIBPATH=user_options_dict['ODE_LIBPATH'])
+	link_env.Append (LIBS=['KX_blenderhook',
+						   'KX_converter',
+						   'PHY_Dummy',
+						   'PHY_Physics',
+						   'KX_ketsji',
+						   'SCA_GameLogic',
+						   'RAS_rasterizer',
+						   'RAS_OpenGLRasterizer',
+						   'blender_expressions',
+						   'SG_SceneGraph',
+						   'blender_MT',
+						   'KX_blenderhook',
+						   'KX_network',
+						   'blender_kernel',
+						   'NG_network',
+						   'NG_loopbacknetwork'])
+	if user_options_dict['BUILD_BLENDER_PLAYER'] == 1:
+		link_env.Append (LIBS=['GPG_ghost'])
+		link_env.Append (LIBS=['GPC_common'])
+	if user_options_dict['USE_PHYSICS'] == 'solid':
+		link_env.Append (LIBS=['PHY_Sumo', 'PHY_Physics', 'blender_MT', 'extern_solid', 'extern_qhull'])
+	else:
+		link_env.Append (LIBS=['PHY_Ode',
+							   'PHY_Physics'])
+		link_env.Append (LIBS=user_options_dict['ODE_LIBRARY'])
+		link_env.Append (LIBPATH=user_options_dict['ODE_LIBPATH'])
+
 link_env.Append (LIBS=['blender_python'])
 link_env.Append (LIBS=user_options_dict['PYTHON_LIBRARY'])
 link_env.Append (LIBPATH=user_options_dict['PYTHON_LIBPATH'])
diff --git a/source/gameengine/GamePlayer/SConscript b/source/gameengine/GamePlayer/SConscript
new file mode 100644
index 00000000000..d7810d8a881
--- /dev/null
+++ b/source/gameengine/GamePlayer/SConscript
@@ -0,0 +1,2 @@
+SConscript(['common/SConscript',
+			'ghost/SConscript'])
\ No newline at end of file
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
new file mode 100644
index 00000000000..2a72983ac72
--- /dev/null
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -0,0 +1,68 @@
+import sys
+Import ('user_options_dict')
+Import ('library_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']
+
+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'])
+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'])
+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'])
+
+gp_common_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+gp_common_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
+
+if sys.platform=='win32':
+    gp_common_env.Append (CXXFLAGS = ['/GR'])
+
+gp_common_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPC_common', source=source_files)
\ No newline at end of file
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
new file mode 100644
index 00000000000..d9a8b312cab
--- /dev/null
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -0,0 +1,50 @@
+import sys
+Import ('user_options_dict')
+Import ('library_env')
+
+gp_ghost_env = library_env.Copy()
+
+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',
+								'#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'])
+
+gp_ghost_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+gp_ghost_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
+
+if sys.platform=='win32':
+    gp_ghost_env.Append (CXXFLAGS = ['/GR'])
+
+gp_ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/GPG_ghost', source=source_files)
\ No newline at end of file
diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript
index ebe66a15312..937c2a041cc 100644
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -14,6 +14,9 @@ SConscript(['BlenderRoutines/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
             'SceneGraph/SConscript'])
 
+if user_options_dict['BUILD_BLENDER_PLAYER']:
+	SConscript(['GamePlayer/SConscript'])
+
 if user_options_dict['USE_PHYSICS'] == 'solid':
     SConscript(['Physics/Sumo/SConscript'])
 elif user_options_dict['USE_PHYSICS'] == 'ode':