diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-18 23:25:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-18 23:25:58 +0400 |
| commit | 89d2559e6dbde26acdd45e3fe9d6eff2c62d98c0 (patch) | |
| tree | b7c806925ce3cc07283f8c210554c33e626cf4a2 /source/blender/python | |
| parent | 025b6dcbc3f6303e051354cbfb694ee810934979 (diff) | |
2.5
* Update cmake and makefiles to link python generic.
* Fix game engine building for cmake and makefiles.
* Fix compile error with py 3.x, due to 2.x compat fix.
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/SConscript | 2 | ||||
| -rwxr-xr-x | source/blender/python/generic/BGL.h | 2 | ||||
| -rw-r--r-- | source/blender/python/generic/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_compat.h | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 4b62c912d34..73dc171fc3e 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c') incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' -incs += ' #intern/guardedalloc #intern/memutil #/extern/glew/include' +incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' incs += ' ' + env['BF_PYTHON_INC'] defs = [] diff --git a/source/blender/python/generic/BGL.h b/source/blender/python/generic/BGL.h index 0e82ddf6d29..e2d1b0bb495 100755 --- a/source/blender/python/generic/BGL.h +++ b/source/blender/python/generic/BGL.h @@ -41,8 +41,8 @@ #endif #include <Python.h> +#include <GL/glew.h> #include "../intern/bpy_compat.h" -#include "BIF_gl.h" PyObject *BGL_Init( const char *from ); diff --git a/source/blender/python/generic/Makefile b/source/blender/python/generic/Makefile index 6e8e5bc1d2e..20cf7f19ec7 100644 --- a/source/blender/python/generic/Makefile +++ b/source/blender/python/generic/Makefile @@ -28,7 +28,7 @@ # # -LIBNAME = python +LIBNAME = gen_python DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk diff --git a/source/blender/python/intern/Makefile b/source/blender/python/intern/Makefile index 3e28f5aac31..0c4a540a4bd 100644 --- a/source/blender/python/intern/Makefile +++ b/source/blender/python/intern/Makefile @@ -37,6 +37,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) # OpenGL and Python CPPFLAGS += $(OGL_CPPFLAGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # PreProcessor stuff diff --git a/source/blender/python/intern/bpy_compat.h b/source/blender/python/intern/bpy_compat.h index 3a2d4bda84c..1ad9376c13b 100644 --- a/source/blender/python/intern/bpy_compat.h +++ b/source/blender/python/intern/bpy_compat.h @@ -88,6 +88,7 @@ typedef Py_ssize_t (*lenfunc)(PyObject *); #endif +#if PY_VERSION_HEX < 0x03000000 #ifndef ssizeargfunc #define ssizeargfunc intargfunc #endif @@ -103,6 +104,7 @@ typedef Py_ssize_t (*lenfunc)(PyObject *); #ifndef ssizessizeobjargproc #define ssizessizeobjargproc intintobjargproc #endif +#endif |