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
This commit is contained in:
2008-09-06 02:46:11 +00:00
parent e279aadb97
commit 8675ff6d1d
22 changed files with 39 additions and 0 deletions

View 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>

View 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

View 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

View 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

View 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
------------------------------*/

View 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

View File

@@ -27,6 +27,7 @@
*/
#include "SCA_ILogicBrick.h"
#include "gen_utils.h" /* python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>

View File

@@ -32,6 +32,8 @@
#include <iostream>
#include "gen_utils.h" /* python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

View File

@@ -37,6 +37,8 @@
#include "eval.h"
#include <algorithm>
#include "gen_utils.h" /* python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

View 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

View 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";

View File

@@ -27,6 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#include <Python.h>
#include "gen_utils.h"
#include "KX_ConstraintWrapper.h"
#include "PHY_IPhysicsEnvironment.h"

View 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.

View 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,

View 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

View 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"

View 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

View 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.
}

View 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

View File

@@ -37,6 +37,8 @@
#include "KX_SCA_ReplaceMeshActuator.h"
#include "gen_utils.h" /* Python stuff */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

View 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

View File

@@ -1,6 +1,8 @@
#include <Python.h>
#include "gen_utils.h"
#include "KX_VehicleWrapper.h"
#include "PHY_IPhysicsEnvironment.h"
#include "PHY_IVehicle.h"