diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-11 00:59:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-11 00:59:30 +0400 |
| commit | a20843bf34e3f638016d1270d4c8b4d598f9cef8 (patch) | |
| tree | 697500980bf668e11c0e268340460a2be836031e /source/gameengine | |
| parent | f49fc58df63d42ab451380ea92e55b1265d14e4e (diff) | |
building without python works again for the BGE
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.h | 11 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 5 |
3 files changed, 14 insertions, 7 deletions
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 625549a272e..b2688231a43 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -461,6 +461,7 @@ typedef PyTypeObject * PyParentObject; // Define the PyParent Object #else // DISABLE_PYTHON +#ifdef WITH_CXX_GUARDEDALLOC #define Py_Header \ public: \ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); } \ @@ -471,6 +472,16 @@ typedef PyTypeObject * PyParentObject; // Define the PyParent Object void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); } \ void operator delete( void *mem ) { MEM_freeN(mem); } \ +#else // WITH_CXX_GUARDEDALLOC + +#define Py_Header \ + public: \ + +#define Py_HeaderPtr \ + public: \ + +#endif // WITH_CXX_GUARDEDALLOC + #endif diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 88993f20132..56ec61f9f4c 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -136,13 +136,14 @@ static RAS_ICanvas* gp_Canvas = NULL; static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = ""; static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save +static SCA_PythonKeyboard* gp_PythonKeyboard = NULL; +static SCA_PythonMouse* gp_PythonMouse = NULL; #endif // DISABLE_PYTHON static KX_Scene* gp_KetsjiScene = NULL; static KX_KetsjiEngine* gp_KetsjiEngine = NULL; static RAS_IRasterizer* gp_Rasterizer = NULL; -static SCA_PythonKeyboard* gp_PythonKeyboard = NULL; -static SCA_PythonMouse* gp_PythonMouse = NULL; + void KX_SetActiveScene(class KX_Scene* scene) { diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 9e2545f41cc..a30591d8da1 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -85,12 +85,7 @@ #ifdef USE_BULLET #include "KX_SoftBodyDeformer.h" -#endif - -// to get USE_BULLET! #include "KX_ConvertPhysicsObject.h" - -#ifdef USE_BULLET #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" #endif |