[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32876] trunk/blender/source: fix for linking the player, also fixes building without python and bullet.

[Campbell Barton]

Revision: 32876
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32876
Author:   campbellbarton
Date:     2010-11-05 02:47:55 +0100 (Fri, 05 Nov 2010)

Log Message:
-----------
fix for linking the player, also fixes building without python and bullet.

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2010-11-05 00:09:45 UTC (rev 32875)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2010-11-05 01:47:55 UTC (rev 32876)
@@ -74,8 +74,8 @@
 		bf_converter 
 		bf_ketsji 
 		bf_bullet 
+		bf_dummy
 		bf_common 
-		bf_dummy 
 		bf_logic 
 		bf_rasterizer 
 		bf_oglrasterizer 

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-11-05 00:09:45 UTC (rev 32875)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-11-05 01:47:55 UTC (rev 32876)
@@ -358,6 +358,7 @@
 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){}

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2010-11-05 00:09:45 UTC (rev 32875)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2010-11-05 01:47:55 UTC (rev 32876)
@@ -603,8 +603,11 @@
 		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 @@
 		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 @@
 
 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 @@
 	
 	// when exiting the mainloop
 	exitGamePythonScripting();
+#endif
+	
 	m_ketsjiengine->StopEngine();
 	m_networkdevice->Disconnect();
 

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2010-11-05 00:09:45 UTC (rev 32875)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2010-11-05 01:47:55 UTC (rev 32876)
@@ -822,8 +822,9 @@
 						
 						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;