forked from bartvdbraak/blender
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.
This commit is contained in:
parent
04d3741947
commit
1dd1cea06e
@ -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"
|
||||
|
@ -156,9 +156,10 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
|
||||
|
||||
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
|
||||
|
@ -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"
|
||||
|
@ -57,9 +57,4 @@ IF(WITH_FFMPEG)
|
||||
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}")
|
||||
|
@ -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)
|
||||
|
@ -105,11 +105,6 @@ SET(SRC
|
||||
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)
|
||||
|
@ -78,9 +78,4 @@ SET(SRC
|
||||
VoidValue.h
|
||||
)
|
||||
|
||||
IF(WITH_PYTHON)
|
||||
LIST(APPEND INC ${PYTHON_INC})
|
||||
ADD_DEFINITIONS(-DWITH_PYTHON)
|
||||
ENDIF(WITH_PYTHON)
|
||||
|
||||
BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}")
|
||||
|
@ -129,9 +129,4 @@ ELSE(WITH_SDL)
|
||||
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}")
|
||||
|
@ -88,11 +88,6 @@ SET(SRC
|
||||
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}")
|
||||
|
@ -76,9 +76,4 @@ IF(WITH_FFMPEG)
|
||||
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}")
|
||||
|
@ -208,11 +208,6 @@ ELSE(WITH_SDL)
|
||||
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)
|
||||
|
@ -50,9 +50,4 @@ SET(SRC
|
||||
KX_NetworkObjectSensor.h
|
||||
)
|
||||
|
||||
IF(WITH_PYTHON)
|
||||
LIST(APPEND INC ${PYTHON_INC})
|
||||
ADD_DEFINITIONS(-DWITH_PYTHON)
|
||||
ENDIF(WITH_PYTHON)
|
||||
|
||||
BLENDERLIB(ge_logic_network "${SRC}" "${INC}")
|
||||
|
@ -13,4 +13,8 @@ incs += ' #intern/guardedalloc #source/blender/blenlib'
|
||||
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'])
|
||||
|
@ -12,4 +12,8 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
|
||||
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'])
|
||||
|
@ -91,9 +91,4 @@ IF(WITH_FFMPEG)
|
||||
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}")
|
||||
|
Loading…
Reference in New Issue
Block a user