[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20989] branches/blender2.5/blender/source : 2.5

Brecht Van Lommel brecht at blender.org
Thu Jun 18 21:25:58 CEST 2009 

Revision: 20989
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20989
Author:   blendix
Date:     2009-06-18 21:25:58 +0200 (Thu, 18 Jun 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/blender/python/SConscript
    branches/blender2.5/blender/source/blender/python/generic/BGL.h
    branches/blender2.5/blender/source/blender/python/generic/Makefile
    branches/blender2.5/blender/source/blender/python/intern/Makefile
    branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
    branches/blender2.5/blender/source/creator/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Converter/Makefile
    branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Ketsji/Makefile

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/Makefile	2009-06-18 19:25:58 UTC (rev 20989)
@@ -162,6 +162,7 @@
 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

Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/blender/python/SConscript	2009-06-18 19:25:58 UTC (rev 20989)
@@ -5,7 +5,7 @@
 
 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 = []

Modified: branches/blender2.5/blender/source/blender/python/generic/BGL.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/BGL.h	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/blender/python/generic/BGL.h	2009-06-18 19:25:58 UTC (rev 20989)
@@ -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 );
 

Modified: branches/blender2.5/blender/source/blender/python/generic/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Makefile	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/blender/python/generic/Makefile	2009-06-18 19:25:58 UTC (rev 20989)
@@ -28,7 +28,7 @@
 #
 #
 
-LIBNAME = python
+LIBNAME = gen_python
 DIR = $(OCGDIR)/blender/$(LIBNAME)
 
 include nan_compile.mk

Modified: branches/blender2.5/blender/source/blender/python/intern/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/Makefile	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/blender/python/intern/Makefile	2009-06-18 19:25:58 UTC (rev 20989)
@@ -37,6 +37,7 @@
 
 # OpenGL and Python
 CPPFLAGS += $(OGL_CPPFLAGS)
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
 # PreProcessor stuff 

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2009-06-18 19:25:58 UTC (rev 20989)
@@ -88,6 +88,7 @@
 #endif
 
 
+#if PY_VERSION_HEX < 0x03000000
 #ifndef ssizeargfunc
 #define ssizeargfunc intargfunc
 #endif
@@ -103,6 +104,7 @@
 #ifndef ssizessizeobjargproc
 #define ssizessizeobjargproc intintobjargproc
 #endif
+#endif
 
 
 

Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt	2009-06-18 19:25:58 UTC (rev 20989)
@@ -221,6 +221,7 @@
     blender_radiosity 
     blender_ONL 
     bf_python 
+    bf_gen_python 
     bf_blenkernel 
     bf_nodes
 	bf_gpu
@@ -269,6 +270,7 @@
     extern_qhull 
     bf_moto 
     bf_python
+    bf_gen_python
     bf_quicktime
     extern_binreloc
     extern_glew

Modified: branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt	2009-06-18 19:25:58 UTC (rev 20989)
@@ -49,6 +49,7 @@
   ../../../source/blender
   ../../../source/blender/include
   ../../../source/blender/makesdna
+  ../../../source/blender/makesrna
   ../../../source/gameengine/Rasterizer
   ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
   ../../../source/gameengine/GameLogic

Modified: branches/blender2.5/blender/source/gameengine/Converter/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-06-18 19:25:58 UTC (rev 20989)
@@ -48,6 +48,7 @@
 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

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt	2009-06-18 19:25:58 UTC (rev 20989)
@@ -53,7 +53,8 @@
   ../../../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 

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-06-18 18:48:15 UTC (rev 20988)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-06-18 19:25:58 UTC (rev 20989)
@@ -41,7 +41,7 @@
 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

More information about the Bf-blender-cvs mailing list