[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19114] trunk/blender: Building the game engine with Solid/ Sumo is now optional for scons using WITH_BF_SOLID.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 25 13:07:51 CET 2009
Revision: 19114
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19114
Author: campbellbarton
Date: 2009-02-25 13:07:51 +0100 (Wed, 25 Feb 2009)
Log Message:
-----------
Building the game engine with Solid/Sumo is now optional for scons using WITH_BF_SOLID.
Now Sumo is has been deprecated for a while we might want to remove it for 2.5.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/extern/SConscript
trunk/blender/source/blender/src/SConscript
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/GamePlayer/common/SConscript
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/SConscript
trunk/blender/tools/btools.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/SConstruct 2009-02-25 12:07:51 UTC (rev 19114)
@@ -280,6 +280,7 @@
env['WITH_BF_PNG'] = False
env['WITH_BF_ODE'] = False
env['WITH_BF_BULLET'] = False
+ env['WITH_BF_SOLID'] = False
env['WITH_BF_BINRELOC'] = False
env['BF_BUILDINFO'] = False
env['BF_NO_ELBEEM'] = True
Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/extern/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -5,8 +5,8 @@
SConscript(['glew/SConscript'])
if env['WITH_BF_GAMEENGINE']:
- SConscript(['qhull/SConscript',
- 'solid/SConscript'])
+ if env['WITH_BF_SOLID']:
+ SConscript(['qhull/SConscript', 'solid/SConscript'])
if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/blender/src/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -70,7 +70,9 @@
if env['WITH_BF_GAMEENGINE']:
defs.append('GAMEBLENDER=1')
-
+ if env['WITH_BF_SOLID']:
+ defs.append('USE_SUMO_SOLID')
+
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -2,6 +2,7 @@
Import ('env')
sources = env.Glob('*.cpp')
+defs = []
incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
@@ -12,13 +13,17 @@
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 += ' #source/gameengine/Physics/Bullet'
+incs += ' #source/gameengine/Network/LoopBackNetwork'
incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader'
incs += ' #extern/glew/include #source/blender/gpu'
+if env['WITH_BF_SOLID']:
+ incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/Fuzzics/include'
+ incs += ' ' + env['BF_SOLID_INC']
+ defs.append('USE_SUMO_SOLID')
+
incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_SOLID_INC']
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
@@ -27,4 +32,4 @@
cxxflags.append ('/GR')
cxxflags.append ('/O2')
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , cxx_compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , cxx_compileflags=cxxflags)
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/Converter/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -2,6 +2,7 @@
Import ('env')
sources = env.Glob('*.cpp')
+defs = []
incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
@@ -14,12 +15,16 @@
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/gameengine/Physics/Dummy'
+incs += ' #source/gameengine/Network/LoopBackNetwork'
incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu'
+if env['WITH_BF_SOLID']:
+ incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/Fuzzics/include'
+ incs += ' ' + env['BF_SOLID_INC']
+ defs.append('USE_SUMO_SOLID')
+
incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_SOLID_INC']
incs += ' ' + env['BF_BULLET_INC']
-env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['game','player'], priority=[5,70] )
Modified: trunk/blender/source/gameengine/GamePlayer/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/GamePlayer/common/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -39,15 +39,13 @@
'#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',
'#source/blender/gpu',
'#extern/glew/include']
-
+
#This is all plugin stuff!
#if sys.platform=='win32':
# source_files += ['windows/GPW_Canvas.cpp',
@@ -62,8 +60,12 @@
# 'unix/GPU_System.cpp']
# gp_common_env.Append ( CPPPATH = ['unix'])
+if env['WITH_BF_SOLID']:
+ incs.append('#source/gameengine/Physics/Sumo')
+ incs.append('#source/gameengine/Physics/Sumo/Fuzzics/include')
+ incs += Split(env['BF_SOLID_INC'])
+
incs += Split(env['BF_PYTHON_INC'])
-incs += Split(env['BF_SOLID_INC'])
incs += Split(env['BF_PNG_INC'])
incs += Split(env['BF_ZLIB_INC'])
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2009-02-25 12:07:51 UTC (rev 19114)
@@ -34,8 +34,6 @@
'#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',
@@ -43,8 +41,11 @@
'#source/blender/gpu',
'#extern/glew/include']
+if env['WITH_BF_SOLID']:
+ incs.append(['#source/gameengine/Physics/Sumo', '#source/gameengine/Physics/Sumo/Fuzzics/include'])
+ incs += Split(env['BF_SOLID_INC'])
+
incs += Split(env['BF_PYTHON_INC'])
-incs += Split(env['BF_SOLID_INC'])
cxxflags = []
if env['OURPLATFORM']=='win32-vc':
Modified: trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h 2009-02-25 12:07:51 UTC (rev 19114)
@@ -29,7 +29,10 @@
#ifndef __KX_CLIENTOBJECT_INFO_H
#define __KX_CLIENTOBJECT_INFO_H
+/* Note, the way this works with/without sumo is a bit odd */
+#ifdef USE_SUMO_SOLID
#include <SM_Object.h>
+#endif //USE_SUMO_SOLID
#include <list>
@@ -38,7 +41,10 @@
/**
* Client Type and Additional Info. This structure can be use instead of a bare void* pointer, for safeness, and additional info for callbacks
*/
-struct KX_ClientObjectInfo : public SM_ClientObject
+struct KX_ClientObjectInfo
+#ifdef USE_SUMO_SOLID
+ : public SM_ClientObject
+#endif
{
enum clienttype {
STATIC,
@@ -52,14 +58,18 @@
std::list<SCA_ISensor*> m_sensors;
public:
KX_ClientObjectInfo(KX_GameObject *gameobject, clienttype type = STATIC, void *auxilary_info = NULL) :
+#ifdef USE_SUMO_SOLID
SM_ClientObject(),
+#endif
m_type(type),
m_gameobject(gameobject),
m_auxilary_info(auxilary_info)
{}
- KX_ClientObjectInfo(const KX_ClientObjectInfo ©)
- : SM_ClientObject(copy),
+ KX_ClientObjectInfo(const KX_ClientObjectInfo ©) :
+#ifdef USE_SUMO_SOLID
+ SM_ClientObject(copy),
+#endif
m_type(copy.m_type),
m_gameobject(copy.m_gameobject),
m_auxilary_info(copy.m_auxilary_info)
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h 2009-02-25 12:07:51 UTC (rev 19114)
@@ -32,7 +32,7 @@
/* These are defined by the build system... */
//but the build system is broken, because it doesn't allow for 2 or more defines at once.
//Please leave Sumo _AND_ Bullet enabled
-#define USE_SUMO_SOLID
+//#define USE_SUMO_SOLID // scons defines this
#define USE_BULLET
//#define USE_ODE
Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2009-02-25 11:26:16 UTC (rev 19113)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2009-02-25 12:07:51 UTC (rev 19114)
@@ -59,7 +59,10 @@
#include "KX_PythonInit.h"
#include "KX_PyConstraintBinding.h"
#include "PHY_IPhysicsEnvironment.h"
+
+#ifdef USE_SUMO_SOLID
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list