[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33375] trunk/blender/source: fix for error when changing DISBALE_PYTHON -> WITH_PYTHON,
Campbell Barton
ideasman42 at gmail.com
Mon Nov 29 08:56:46 CET 2010
Revision: 33375
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33375
Author: campbellbarton
Date: 2010-11-29 08:56:45 +0100 (Mon, 29 Nov 2010)
Log Message:
-----------
fix for error when changing DISBALE_PYTHON -> WITH_PYTHON,
This define wasn't set in some parts of the BGE causing problems with the view matrix.
in CMake define for the entire BGE fixes this.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/util/undo.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/SceneGraph/SConscript
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2010-11-29 07:56:45 UTC (rev 33375)
@@ -51,12 +51,6 @@
#include "BIF_gl.h"
-
-#ifdef WITH_PYTHON
-//#include "BPY_extern.h"
-//#include "BPY_menus.h"
-#endif
-
#include "ED_mesh.h"
#include "ED_screen.h"
#include "ED_view3d.h"
Modified: trunk/blender/source/blender/editors/util/undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/undo.c 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/blender/editors/util/undo.c 2010-11-29 07:56:45 UTC (rev 33375)
@@ -156,9 +156,10 @@
if(do_glob_undo) {
if(U.uiflag & USER_GLOBALUNDO) {
-#ifdef WITH_PYTHON
+ // note python defines not valid here anymore.
+ //#ifdef WITH_PYTHON
// XXX BPY_scripts_clear_pyobjects();
-#endif
+ //#endif
if(undoname)
BKE_undo_name(C, undoname);
else
Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/blender/python/intern/bpy.c 2010-11-29 07:56:45 UTC (rev 33375)
@@ -25,6 +25,7 @@
/* This file defines the '_bpy' module which is used by python's 'bpy' package.
* a script writer should never directly access this module */
+#define WITH_PYTHON /* for AUD_PyInit.h, possibly others */
#include "bpy_util.h"
#include "bpy_rna.h"
Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -57,9 +57,4 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB(ge_blen_routines "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -24,6 +24,12 @@
#
# ***** END GPL LICENSE BLOCK *****
+# there are too many inter-includes so best define here
+IF(WITH_PYTHON)
+ INCLUDE_DIRECTORIES(${PYTHON_INC})
+ ADD_DEFINITIONS(-DWITH_PYTHON)
+ENDIF(WITH_PYTHON)
+
ADD_SUBDIRECTORY(BlenderRoutines)
ADD_SUBDIRECTORY(Converter)
ADD_SUBDIRECTORY(Expressions)
Modified: trunk/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -105,11 +105,6 @@
KX_SoftBodyDeformer.h
)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
IF(WITH_BULLET)
ADD_DEFINITIONS(-DUSE_BULLET)
ENDIF(WITH_BULLET)
Modified: trunk/blender/source/gameengine/Expressions/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -78,9 +78,4 @@
VoidValue.h
)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GameLogic/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/GameLogic/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -129,9 +129,4 @@
ADD_DEFINITIONS(-DDISABLE_SDL)
ENDIF(WITH_SDL)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB(ge_logic "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -88,11 +88,6 @@
windows/GPW_System.h
)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB_NOLIST(ge_player_common "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -76,9 +76,4 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB_NOLIST(ge_player_ghost "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -208,11 +208,6 @@
ADD_DEFINITIONS(-DDISABLE_SDL)
ENDIF(WITH_SDL)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
IF(WITH_FFMPEG)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
Modified: trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -50,9 +50,4 @@
KX_NetworkObjectSensor.h
)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB(ge_logic_network "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2010-11-29 07:56:45 UTC (rev 33375)
@@ -13,4 +13,8 @@
if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_CXX_GUARDEDALLOC')
+if env['WITH_BF_PYTHON']:
+ incs += ' ' + env['BF_PYTHON_INC']
+ defs.append('WITH_PYTHON')
+
env.BlenderLib ( 'ge_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/SceneGraph/SConscript
===================================================================
--- trunk/blender/source/gameengine/SceneGraph/SConscript 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/SceneGraph/SConscript 2010-11-29 07:56:45 UTC (rev 33375)
@@ -12,4 +12,8 @@
defs.append('WITH_CXX_GUARDEDALLOC')
incs += ' #intern/guardedalloc'
+if env['WITH_BF_PYTHON']:
+ incs += ' ' + env['BF_PYTHON_INC']
+ defs.append('WITH_PYTHON')
+
env.BlenderLib ( 'ge_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt 2010-11-29 07:37:20 UTC (rev 33374)
+++ trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt 2010-11-29 07:56:45 UTC (rev 33375)
@@ -91,9 +91,4 @@
ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
ENDIF(WITH_FFMPEG)
-IF(WITH_PYTHON)
- LIST(APPEND INC ${PYTHON_INC})
- ADD_DEFINITIONS(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
-
BLENDERLIB(ge_videotex "${SRC}" "${INC}")
More information about the Bf-blender-cvs
mailing list