diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-05 04:47:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-05 04:47:55 +0300 |
commit | da402c937ea3e86159ab22c3efd4f235c5533c08 (patch) | |
tree | 37f54b34d96b6a95111648001e60a5b693be02bc /source | |
parent | 52865a51408fba9c871caff82ca0acb71a37d2d7 (diff) |
fix for linking the player, also fixes building without python and bullet.
Diffstat (limited to 'source')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 11 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index b1dbde8d4b1..6c97c2a4465 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -74,8 +74,8 @@ IF(UNIX) bf_converter bf_ketsji bf_bullet + bf_dummy bf_common - bf_dummy bf_logic bf_rasterizer bf_oglrasterizer diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 7bef93cc4d8..7f0a57be371 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -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_operatortype_remove(const char *idname){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;} void WM_operator_properties_free(struct PointerRNA *ptr){} void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){} diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 506601f478b..197e31af188 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -603,8 +603,11 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) m_ketsjiengine->SetNetworkDevice(m_networkdevice); m_ketsjiengine->SetTimingDisplay(frameRate, false, false); - +#ifdef WITH_PYTHON CValue::SetDeprecationWarnings(nodepwarnings); +#else + (void)nodepwarnings; +#endif m_ketsjiengine->SetUseFixedTime(fixed_framerate); m_ketsjiengine->SetTimingDisplay(frameRate, profile, properties); @@ -687,10 +690,11 @@ bool GPG_Application::startEngine(void) 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); +#ifdef WITH_PYTHON // Set the GameLogic.globalDict from marshal'd data, so we can // load new blend files and keep data in GameLogic.globalDict loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); - +#endif m_sceneconverter->ConvertScene( startscene, m_rendertools, @@ -723,6 +727,7 @@ bool GPG_Application::startEngine(void) void GPG_Application::stopEngine() { +#ifdef WITH_PYTHON // GameLogic.globalDict gets converted into a buffer, and sorted in // m_pyGlobalDictString so we can restore after python has stopped // and started between .blend file loads. @@ -735,6 +740,8 @@ void GPG_Application::stopEngine() // when exiting the mainloop exitGamePythonScripting(); +#endif + m_ketsjiengine->StopEngine(); m_networkdevice->Disconnect(); diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 94142e7a604..45eea75eb2f 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -822,8 +822,9 @@ int main(int argc, char** argv) BLI_strncpy(pathname, maggie->name, sizeof(pathname)); BLI_strncpy(G.main->name, maggie->name, sizeof(G.main->name)); +#ifdef WITH_PYTHON setGamePythonPath(G.main->name); - +#endif if (firstTimeRunning) { firstTimeRunning = false; |