forked from bartvdbraak/blender
building without python works again for the BGE
This commit is contained in:
parent
f49fc58df6
commit
a20843bf34
@ -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
|
||||
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user