diff options
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/creator/SConscript | 4 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a039dca208e..b39393bc8b7 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -82,10 +82,7 @@ if(WITH_PYTHON) endif() if(WITH_GAMEENGINE) - blender_include_dirs( - ../kernel/gen_messaging - ../kernel/gen_system - ) + blender_include_dirs(../gameengine/BlenderRoutines) add_definitions(-DWITH_GAMEENGINE) endif() @@ -778,7 +775,6 @@ endif() bf_collada bf_intern_bsp bf_intern_bop - bf_gen_system bf_intern_decimate bf_intern_elbeem bf_intern_ik @@ -800,7 +796,6 @@ endif() ge_logic_expressions ge_scenegraph ge_logic_network - bf_gen_system bf_python # duplicate for BPY_driver_exec ge_logic_ngnetwork extern_bullet diff --git a/source/creator/SConscript b/source/creator/SConscript index 8577872c48a..79e03c8dddc 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -7,8 +7,8 @@ sources = 'creator.c' incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel' incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf' incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager' -incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging' -incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu' +incs += ' ../blender/makesdna ../blender/makesrna' +incs += ' ../gameengine/BlenderRoutines #/extern/glew/include ../blender/gpu' incs += ' ' + env['BF_OPENGL_INC'] defs = [] diff --git a/source/creator/creator.c b/source/creator/creator.c index ab94131966f..2b146822194 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -108,8 +108,7 @@ /* for passing information between creator and gameengine */ #ifdef WITH_GAMEENGINE -#include "GEN_messaging.h" -#include "SYS_System.h" +#include "BL_System.h" #else /* dummy */ #define SYS_SystemHandle int #endif @@ -1216,7 +1215,6 @@ int main(int argc, const char **argv) #ifdef WITH_GAMEENGINE syshandle = SYS_GetSystem(); - GEN_init_messaging_system(); #else syshandle= 0; #endif |