[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16391] trunk/blender/source/gameengine: Trying to keep things compiling on my imac (10.4.11)
Kent Mein
mein at cs.umn.edu
Sat Sep 6 04:46:12 CEST 2008
Revision: 16391
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16391
Author: sirdude
Date: 2008-09-06 04:46:11 +0200 (Sat, 06 Sep 2008)
Log Message:
-----------
Trying to keep things compiling on my imac (10.4.11)
I'm getting this error now:
GPG_Application.cpp: In member function 'void GPG_Application::stopEngine()':
/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/marshal.h:12: error: too many arguments to function 'PyObject* PyMarshal_WriteObjectToString(PyObject*)'
GPG_Application.cpp:720: error: at this point in file
Are we offically not supporint older versions of python now? :)
Kent
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
trunk/blender/source/gameengine/Converter/Makefile
trunk/blender/source/gameengine/Expressions/Makefile
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/GameLogic/Makefile
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -50,6 +50,7 @@
#include "MT_Matrix4x4.h"
#include "BKE_utildefines.h"
#include "FloatValue.h"
+#include "gen_utils.h" /* Python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -50,6 +50,8 @@
#include "MT_Matrix4x4.h"
#include "BKE_utildefines.h"
+#include "gen_utils.h" /* python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: trunk/blender/source/gameengine/Converter/Makefile
===================================================================
--- trunk/blender/source/gameengine/Converter/Makefile 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Converter/Makefile 2008-09-06 02:46:11 UTC (rev 16391)
@@ -39,6 +39,7 @@
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+CPPFLAGS += -I../../blender/python/api2_2x
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_SOLID)/include
CPPFLAGS += -I$(NAN_BULLET2)/include
Modified: trunk/blender/source/gameengine/Expressions/Makefile
===================================================================
--- trunk/blender/source/gameengine/Expressions/Makefile 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Expressions/Makefile 2008-09-06 02:46:11 UTC (rev 16391)
@@ -36,6 +36,8 @@
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+CPPFLAGS += -I../../blender/python/api2_2x
+CPPFLAGS += -I../../blender/makesdna
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -50,6 +50,7 @@
#include "stdlib.h"
#include "PyObjectPlus.h"
#include "STR_String.h"
+#include "gen_utils.h"
/*------------------------------
* PyObjectPlus Type -- Every class, even the abstract one should have a Type
------------------------------*/
Modified: trunk/blender/source/gameengine/GameLogic/Makefile
===================================================================
--- trunk/blender/source/gameengine/GameLogic/Makefile 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/GameLogic/Makefile 2008-09-06 02:46:11 UTC (rev 16391)
@@ -42,7 +42,9 @@
CPPFLAGS += -I../Rasterizer
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include
+CPPFLAGS += -I../../blender/makesdna
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+CPPFLAGS += -I../../blender/python/api2_2x
CPPFLAGS += $(NAN_SDLCFLAGS)
CPPFLAGS += -I../../kernel/gen_system
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -27,6 +27,7 @@
*/
#include "SCA_ILogicBrick.h"
+#include "gen_utils.h" /* python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -32,6 +32,8 @@
#include <iostream>
+#include "gen_utils.h" /* python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -37,6 +37,8 @@
#include "eval.h"
#include <algorithm>
+#include "gen_utils.h" /* python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -15,6 +15,8 @@
#include "RAS_MeshObject.h"
#include "RAS_IRasterizer.h"
+#include "gen_utils.h" /* python stuff */
+
#define spit(x) std::cout << x << std::endl;
#define SORT_UNIFORMS 1
Modified: trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -35,6 +35,8 @@
#include <math.h>
#include "KX_GameObject.h"
+#include "gen_utils.h" /* Python stuff */
+
STR_String KX_CameraActuator::X_AXIS_STRING = "x";
STR_String KX_CameraActuator::Y_AXIS_STRING = "y";
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -27,6 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#include <Python.h>
+#include "gen_utils.h"
#include "KX_ConstraintWrapper.h"
#include "PHY_IPhysicsEnvironment.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -65,6 +65,8 @@
#include "SCA_IActuator.h"
#include "SCA_ISensor.h"
+#include "gen_utils.h" /* python stuff */
+
// This file defines relationships between parents and children
// in the game engine.
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -43,6 +43,8 @@
#include "KX_PyMath.h"
#include "KX_ConvertPhysicsObject.h"
+#include "gen_utils.h" /* Python stuff */
+
PyTypeObject KX_MeshProxy::Type = {
PyObject_HEAD_INIT(&PyType_Type)
0,
Modified: trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -36,6 +36,8 @@
#include "KX_GameObject.h"
#include "KX_PythonInit.h"
+#include "gen_utils.h" /* Python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -27,6 +27,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
#include <Python.h>
+#include "gen_utils.h"
+
#include "KX_PhysicsObjectWrapper.h"
#include "PHY_IPhysicsEnvironment.h"
#include "PHY_IPhysicsController.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -34,6 +34,8 @@
#include "PHY_IPhysicsController.h"
#include "PHY_IVehicle.h"
+#include "gen_utils.h" /* Python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -68,6 +68,8 @@
#include "KX_PyMath.h"
+#include "gen_utils.h" /* Python stuff */
+
extern "C" {
#include "Mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp 2008-09-06 01:18:53 UTC (rev 16390)
+++ trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp 2008-09-06 02:46:11 UTC (rev 16391)
@@ -39,6 +39,8 @@
#include "KX_GameObject.h"
#include "KX_IPhysicsController.h"
+#include "gen_utils.h" /* Python stuff */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list