kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added blender python module to game engine.

Browse Source 
Updated Scons & Makefile
This commit is contained in:
Kester Maddock 2004-04-02 13:21:04 +00:00
parent 594040f769
commit 8e5fd5bba3
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -858,7 +858,6 @@ libraries = (['blender_creator',
'blender_imbuf', 'blender_imbuf',
'blender_avi', 'blender_avi',
'blender_blenlib', 'blender_blenlib',
'blender_python',
'blender_makesdna', 'blender_makesdna',
'blender_kernel', 'blender_kernel',
'blender_BSP', 'blender_BSP',
@ -910,7 +909,7 @@ if user_options_dict['BUILD_GAMEENGINE'] == 1:
'PHY_Physics']) 'PHY_Physics'])
link_env.Append (LIBS=user_options_dict['ODE_LIBRARY']) link_env.Append (LIBS=user_options_dict['ODE_LIBRARY'])
link_env.Append (LIBPATH=user_options_dict['ODE_LIBPATH']) 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 (LIBS=user_options_dict['PYTHON_LIBRARY'])
link_env.Append (LIBPATH=user_options_dict['PYTHON_LIBPATH']) link_env.Append (LIBPATH=user_options_dict['PYTHON_LIBPATH'])
link_env.Append (LINKFLAGS=user_options_dict['PYTHON_LINKFLAGS']) link_env.Append (LINKFLAGS=user_options_dict['PYTHON_LINKFLAGS'])

5
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -54,6 +54,7 @@
#include "KX_Scene.h" #include "KX_Scene.h"
#include "SND_DeviceManager.h" #include "SND_DeviceManager.h"
#include "BPY_extern.h"
static void setSandbox(TPythonSecurityLevel level); static void setSandbox(TPythonSecurityLevel level);
@ -628,7 +629,7 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev
Py_SetProgramName(pname.Ptr()); Py_SetProgramName(pname.Ptr());
Py_NoSiteFlag=1; Py_NoSiteFlag=1;
Py_FrozenFlag=1; Py_FrozenFlag=1;
Py_Initialize(); BPY_start_python();
setSandbox(level); setSandbox(level);
PyObject* moduleobj = PyImport_AddModule("__main__"); PyObject* moduleobj = PyImport_AddModule("__main__");
@ -639,7 +640,7 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev
void exitGamePythonScripting() void exitGamePythonScripting()
{ {
Py_Finalize(); BPY_end_python();
} }

2
source/gameengine/Ketsji/Makefile
View File

@ -39,7 +39,7 @@ include nan_compile.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += $(OGL_CPPFLAGS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include

1
source/gameengine/Ketsji/SConscript
View File

@ -85,6 +85,7 @@ ketsji_env.Append (CPPPATH = ['.',
'#source/blender', '#source/blender',
'#source/blender/include', '#source/blender/include',
'#source/blender/makesdna', '#source/blender/makesdna',
'#source/blender/python',
'#source/gameengine/Rasterizer', '#source/gameengine/Rasterizer',
'#source/gameengine/GameLogic', '#source/gameengine/GameLogic',
'#source/gameengine/Expressions', '#source/gameengine/Expressions',