Trying to keep things compiling on my imac (10.4.11)
authorKent Mein <mein@cs.umn.edu>
Sat, 6 Sep 2008 02:46:11 +0000 (02:46 +0000)
committerKent Mein <mein@cs.umn.edu>
Sat, 6 Sep 2008 02:46:11 +0000 (02:46 +0000)
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

22 files changed:
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/Makefile
source/gameengine/Expressions/Makefile
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/GameLogic/Makefile
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.cpp

index d8b2e063a9daa5e054e3a21db94b0cd1162fff10..13c251887532a00b796e842c9e6a0b92da626564 100644 (file)
@@ -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>
index 799b6b74b666ec110baa208e160bbc216ec096f2..06a9db866d450da6a5b9abf0c7324997a86fb361 100644 (file)
@@ -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
index 4dd63e428bd59e3318cd8b137524b6c611990dba..9bd8ae4fc7b307fe78b5ebcf45f1791fde00e8f3 100644 (file)
@@ -39,6 +39,7 @@ CPPFLAGS += -I$(OPENGL_HEADERS)
 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
index e9c02eedcf2945573c2e577293cc8300295c3b3b..f333de68be028957983336fd0d72718cff26d3c8 100644 (file)
@@ -36,6 +36,8 @@ include nan_compile.mk
 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
index 1eca527151a399de0a7a7365a6ec34dfa419cfc3..3dfa1b0da3dd500b5a0190156626453b7fa8e7ea 100644 (file)
@@ -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
 ------------------------------*/
index b3eae5d67dc17dd8b2dc1ba52b81e53f5250b93d..564e9b16b55e1bda8123b5c5b5722ca3ea29b298 100644 (file)
@@ -42,7 +42,9 @@ CPPFLAGS += -I../Expressions
 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
index f5512664d8fcbcbdb8808ceb384abef58e57f32f..1c446bc87c4086bac87df461abf6f81f7ab5cd10 100644 (file)
@@ -27,6 +27,7 @@
  */
 
 #include "SCA_ILogicBrick.h"
+#include "gen_utils.h" /* python stuff */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
index 645afc8964b0806a1c7c497189c3e0f5fe680b81..2d42d64abe37866a2bcf6f31ee8e851a43f62c9a 100644 (file)
@@ -32,6 +32,8 @@
 
 #include <iostream>
 
+#include "gen_utils.h" /* python stuff */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
index e6f7b1dd143ac9fab349e8dcd41ad0b85d87dba6..6ba4456bdddcdbb79448a6724e4e9f651e71ae92 100644 (file)
@@ -37,6 +37,8 @@
 #include "eval.h"
 #include <algorithm>
 
+#include "gen_utils.h" /* python stuff */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
index f28d3fa291270c8b4dd1e81c2f1ba3315d8e1a59..f4a4194edfe515ccaedec4c578ba0c76445c5aee 100644 (file)
@@ -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
index 42b909927fd777e2cf8612f0c9563b80b89c7a3f..8f037a93f6a156e090713171268d4983b627f6b4 100644 (file)
@@ -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";
 
index b54da6eb753c4db3ec9c25cbf049aa0a81c5c008..9cb859be30dbb442b4d497a55d7a9ad0bba7e563 100644 (file)
@@ -27,6 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 #include <Python.h>
+#include "gen_utils.h"
 #include "KX_ConstraintWrapper.h"
 #include "PHY_IPhysicsEnvironment.h"
 
index 204eed9fa92aa259fd5f97e029659589a2537204..0ca823e148fa7eccdddef06fdc60ecfb92a1ae2b 100644 (file)
@@ -65,6 +65,8 @@ typedef unsigned long uint_ptr;
 #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.
 
index 5bfe8c70cba8da9eb5aca74aeeb59cb9f4173e08..e420a208ffdd4f1f633d83d73324ac95f77af291 100644 (file)
@@ -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,
index 344e0fccc35265bcebe4250f81f0a1b675d46fae..58000062dcfc35ebdebb7b5887d115ec8f3f80e2 100644 (file)
@@ -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
index 9291199d859569c0979404e36673ea1b22003476..cd76e00a2e3a29e77d72f8e42699833ec852b6a7 100644 (file)
@@ -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"
index 26243c7dba1e1b1db0ad4bf3cbe6db98b8c0cd9f..83695a9f4c3b5790d4009c298338ce39a74f152a 100644 (file)
@@ -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
index f2902d0ef012c46d1faa13614f4ab7be22fea222..c89e4cbd831f027c48c0de591cc3d021d889294a 100644 (file)
@@ -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.
 }
index a7330b9a20ac1d0fd798f5346e90b8217b8397e2..579ad94206bd0b034e7151f8847d64c73c539322 100644 (file)
@@ -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
index 18a297d6c926eff2af7cc576149b44fc6c308942..383347684cbe66a6b20f485edd89ac1e303ec48a 100644 (file)
@@ -37,6 +37,8 @@
 
 #include "KX_SCA_ReplaceMeshActuator.h"
 
+#include "gen_utils.h" /* Python stuff */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
index 67937d5c579948e2f935e4d923d5b3cb17c794e8..962ca93c0188cb585bd18b40c0df0e7287f42e13 100644 (file)
@@ -42,6 +42,8 @@
 #include <iostream>
 #include "KX_GameObject.h"
 
+#include "gen_utils.h" /* Python stuff */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
index f5a2b5e02feabac92e0f2003710b11864a7e0faf..9131afda5ddb0c985223e6a06ea419c3225fbb52 100644 (file)
@@ -1,6 +1,8 @@
 
 
 #include <Python.h>
+#include "gen_utils.h"
+
 #include "KX_VehicleWrapper.h"
 #include "PHY_IPhysicsEnvironment.h"
 #include "PHY_IVehicle.h"