From cb12337363032e59967b4935e10e8d996f297ca1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 May 2011 20:18:42 +0000 Subject: Code cleanup: remove source/kernel module, this wasn't really the kernel of anything, only contained a hash map and functions to pass command line args to the game engine. Moved those to container and BlenderRoutines modules. --- source/blender/editors/space_view3d/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/SConscript | 2 +- source/blender/editors/space_view3d/view3d_view.c | 5 +---- source/blender/readblenfile/CMakeLists.txt | 1 - source/blender/readblenfile/SConscript | 2 +- source/blender/readblenfile/stub/BLO_readblenfileSTUB.c | 11 +++++------ source/blender/render/CMakeLists.txt | 1 - source/blender/windowmanager/CMakeLists.txt | 2 +- source/blender/windowmanager/SConscript | 3 ++- source/blender/windowmanager/intern/wm_init_exit.c | 2 +- 10 files changed, 13 insertions(+), 18 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 9744887ed9f..f923c578769 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -58,7 +58,7 @@ set(SRC ) if(WITH_GAMEENGINE) - list(APPEND INC ../../../kernel/gen_system) + list(APPEND INC ../../../../source/gameengine/BlenderRoutines) add_definitions(-DWITH_GAMEENGINE) endif() diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 3df59d485d5..84ba8d1fe86 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -9,7 +9,7 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include ../../blenloader' incs += ' ../../gpu ../../makesrna ../../blenfont' incs += ' #/intern/smoke/extern' -incs += ' #source/kernel/gen_system' +incs += ' #source/gameengine/BlenderRoutines' if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 8a975eec40f..b46c7236170 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -65,7 +65,7 @@ #include "ED_armature.h" #ifdef WITH_GAMEENGINE -#include "SYS_System.h" +#include "BL_System.h" #endif #include "view3d_intern.h" // own include @@ -1764,9 +1764,6 @@ static void game_set_commmandline_options(GameData *gm) } } -/* maybe we need this defined somewhere else */ -extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *cam_frame, int always_use_expand_framing); - #endif // WITH_GAMEENGINE static int game_engine_poll(bContext *C) diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index 8d3633b4918..9b869d39697 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -31,7 +31,6 @@ set(INC ../blenkernel ../blenlib ../makesdna - ../../kernel/gen_messaging ) set(SRC diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript index 6d8749df1e2..07f84eb52d5 100644 --- a/source/blender/readblenfile/SConscript +++ b/source/blender/readblenfile/SConscript @@ -3,6 +3,6 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging' +incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna' env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,5] ) diff --git a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c index 4900f0c3338..0f3541b510d 100644 --- a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c +++ b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c @@ -34,7 +34,6 @@ #include -#include "GEN_messaging.h" int BLO_readblenfilememory( char *fromBuffer, int fromBufferSize); int BLO_readblenfilename( char *fileName); @@ -47,7 +46,7 @@ BLO_readblenfilememory( char *fromBuffer, int fromBufferSize) { #if defined(DEBUG) - fprintf(GEN_errorstream, + fprintf(stderr, "Error BLO_readblenfilename is a stub\n"); #endif return(1); @@ -58,7 +57,7 @@ BLO_readblenfilename( char *fileName) { #if defined(DEBUG) - fprintf(GEN_errorstream, + fprintf(stderr, "Error BLO_readblenfilename is a stub\n"); #endif return(1); @@ -69,7 +68,7 @@ BLO_readblenfilehandle( int fileHandle) { #if defined(DEBUG) - fprintf(GEN_errorstream, + fprintf(stderr, "Error BLO_readblenfilehandle is a stub\n"); #endif return(1); @@ -80,7 +79,7 @@ BLO_is_a_runtime( char *file) { #if defined(DEBUG) - fprintf(GEN_errorstream, + fprintf(stderr, "Error BLO_is_a_runtime is a stub\n"); #endif return 0; @@ -91,7 +90,7 @@ BLO_read_runtime( char *file) { #if defined(DEBUG) - fprintf(GEN_errorstream, + fprintf(stderr, "Error BLO_read_runtime is a stub\n"); #endif return 0; diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index f00e54c1796..bcb427abd6c 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -36,7 +36,6 @@ set(INC ../makesrna ../blenkernel ../imbuf - ../../kernel/gen_messaging ../../../intern/smoke/extern ../../../intern/mikktspace ../../../intern/guardedalloc diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 251f6605f5e..6f03928e1fc 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -37,12 +37,12 @@ set(INC ../blenloader ../editors/include ../render/extern/include - ../../kernel/gen_system ../../../intern/guardedalloc ../../../intern/memutil ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern + ../../../source/gameengine/BlenderRoutines ${ZLIB_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_PATH} diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 38266717369..f52ac8ba3cb 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -8,11 +8,12 @@ sources = env.Glob('intern/*.c') incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' -incs += ' ../radiosity/extern/include ../../kernel/gen_system' +incs += ' ../radiosity/extern/include' incs += ' ../makesrna ../gpu ../blenfont' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' +incs += ' #source/gameengine/BlenderRoutines' incs += ' ' + env['BF_ZLIB_INC'] diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 620d3314d43..b09e264bd1d 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -72,7 +72,7 @@ #endif #ifdef WITH_GAMEENGINE -#include "SYS_System.h" +#include "BL_System.h" #endif #include "GHOST_Path-api.h" #include "GHOST_C-api.h" -- cgit v1.2.3