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/gameengine | |
| 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/gameengine')
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/Makefile | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 44692241e6f..031c2234ea8 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/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 diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 938994e8b62..abded70f289 100644 --- a/source/gameengine/Converter/Makefile +++ b/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 diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 4aaa49a8493..ee1ff2c6502 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/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 diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index bdc0b335b02..59b3ff178fb 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/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 |