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.

source/Makefile

@@ -162,6 +162,7 @@ COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a
 COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
 COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a
 COMLIB += $(NAN_PNG)/lib/libpng.a
+COMLIB += $(OCGDIR)/blender/gen_python/$(DEBUG_DIR)libgen_python.a
 
 ifeq ($(WITH_QUICKTIME), true)
     COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a

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 = []

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 );
 

source/blender/python/generic/Makefile

@@ -28,7 +28,7 @@
 #
 #
 
-LIBNAME = python
+LIBNAME = gen_python
 DIR = $(OCGDIR)/blender/$(LIBNAME)
 
 include nan_compile.mk

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 

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
 
 
 

source/creator/CMakeLists.txt

@@ -221,6 +221,7 @@ IF(UNIX)
     blender_radiosity 
     blender_ONL 
     bf_python 
+    bf_gen_python 
     bf_blenkernel 
     bf_nodes
 	bf_gpu
@@ -269,6 +270,7 @@ IF(UNIX)
     extern_qhull 
     bf_moto 
     bf_python
+    bf_gen_python
     bf_quicktime
     extern_binreloc
     extern_glew

source/gameengine/Converter/CMakeLists.txt

@@ -49,6 +49,7 @@ SET(INC
   ../../../source/blender
   ../../../source/blender/include
   ../../../source/blender/makesdna
+  ../../../source/blender/makesrna
   ../../../source/gameengine/Rasterizer
   ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
   ../../../source/gameengine/GameLogic

source/gameengine/Converter/Makefile

@@ -48,6 +48,7 @@ CPPFLAGS += -I../../blender
 CPPFLAGS += -I../../blender/windowmanager
 CPPFLAGS += -I../../blender/imbuf
 CPPFLAGS += -I../../blender/makesdna
+CPPFLAGS += -I../../blender/makesrna
 CPPFLAGS += -I../../blender/editors/include
 CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/blenkernel

source/gameengine/Ketsji/CMakeLists.txt

@@ -53,7 +53,8 @@ SET(INC
   ../../../source/gameengine/Ketsji 
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel
-  ../../../source/blender/python/api2_2x
+  ../../../source/blender/python
+  ../../../source/blender/python/generic
   ../../../source/blender 
   ../../../source/blender/include
   ../../../source/blender/makesdna 

source/gameengine/Ketsji/Makefile

@@ -41,7 +41,7 @@ CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) 
 CPPFLAGS += -I../../blender/python
-CPPFLAGS += -I../../blender/python/api2_2x
+CPPFLAGS += -I../../blender/python/generic
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include