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

fix for linking the player, also fixes building without python and bullet.

Browse Source
This commit is contained in:
Campbell Barton 2010-11-05 01:47:55 +00:00
parent 52865a5140
commit da402c937e
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blenderplayer/CMakeLists.txt
View File

@ -74,8 +74,8 @@ IF(UNIX)
bf_converter bf_converter
bf_ketsji bf_ketsji
bf_bullet bf_bullet
bf_common
bf_dummy bf_dummy
bf_common
bf_logic bf_logic
bf_rasterizer bf_rasterizer
bf_oglrasterizer bf_oglrasterizer

1
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -358,6 +358,7 @@ struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType *
int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports){return 0;} int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports){return 0;}
int WM_operatortype_remove(const char *idname){return 0;} int WM_operatortype_remove(const char *idname){return 0;}
int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot){return 0;} int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot){return 0;}
int WM_operator_poll_context(struct bContext *C, struct wmOperatorType *ot, int context){return 0;}
int WM_operator_props_popup(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;} int WM_operator_props_popup(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;}
void WM_operator_properties_free(struct PointerRNA *ptr){} void WM_operator_properties_free(struct PointerRNA *ptr){}
void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){} void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){}

11
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@ -603,8 +603,11 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
m_ketsjiengine->SetNetworkDevice(m_networkdevice); m_ketsjiengine->SetNetworkDevice(m_networkdevice);
m_ketsjiengine->SetTimingDisplay(frameRate, false, false); m_ketsjiengine->SetTimingDisplay(frameRate, false, false);
#ifdef WITH_PYTHON
CValue::SetDeprecationWarnings(nodepwarnings); CValue::SetDeprecationWarnings(nodepwarnings);
#else
(void)nodepwarnings;
#endif
m_ketsjiengine->SetUseFixedTime(fixed_framerate); m_ketsjiengine->SetUseFixedTime(fixed_framerate);
m_ketsjiengine->SetTimingDisplay(frameRate, profile, properties); m_ketsjiengine->SetTimingDisplay(frameRate, profile, properties);
@ -687,10 +690,11 @@ bool GPG_Application::startEngine(void)
if(m_startScene->gm.stereoflag == STEREO_DOME) if(m_startScene->gm.stereoflag == STEREO_DOME)
m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext); m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext);
#ifdef WITH_PYTHON
// Set the GameLogic.globalDict from marshal'd data, so we can // Set the GameLogic.globalDict from marshal'd data, so we can
// load new blend files and keep data in GameLogic.globalDict // load new blend files and keep data in GameLogic.globalDict
loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length);
#endif
m_sceneconverter->ConvertScene( m_sceneconverter->ConvertScene(
startscene, startscene,
m_rendertools, m_rendertools,
@ -723,6 +727,7 @@ bool GPG_Application::startEngine(void)
void GPG_Application::stopEngine() void GPG_Application::stopEngine()
{ {
#ifdef WITH_PYTHON
// GameLogic.globalDict gets converted into a buffer, and sorted in // GameLogic.globalDict gets converted into a buffer, and sorted in
// m_pyGlobalDictString so we can restore after python has stopped // m_pyGlobalDictString so we can restore after python has stopped
// and started between .blend file loads. // and started between .blend file loads.
@ -735,6 +740,8 @@ void GPG_Application::stopEngine()
// when exiting the mainloop // when exiting the mainloop
exitGamePythonScripting(); exitGamePythonScripting();
#endif
m_ketsjiengine->StopEngine(); m_ketsjiengine->StopEngine();
m_networkdevice->Disconnect(); m_networkdevice->Disconnect();

3
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
View File

@ -822,8 +822,9 @@ int main(int argc, char** argv)
BLI_strncpy(pathname, maggie->name, sizeof(pathname)); BLI_strncpy(pathname, maggie->name, sizeof(pathname));
BLI_strncpy(G.main->name, maggie->name, sizeof(G.main->name)); BLI_strncpy(G.main->name, maggie->name, sizeof(G.main->name));
#ifdef WITH_PYTHON
setGamePythonPath(G.main->name); setGamePythonPath(G.main->name);
#endif
if (firstTimeRunning) if (firstTimeRunning)
{ {
firstTimeRunning = false; firstTimeRunning = false;