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