diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-07 00:18:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-07 00:18:42 +0400 |
| commit | cb12337363032e59967b4935e10e8d996f297ca1 (patch) | |
| tree | 6d73642eaf1c0f8d793e752988dfdbdd4e41d150 /source/blender/windowmanager | |
| parent | 4eb1b5256e0159f747c055e10bd091a40fc834b7 (diff) | |
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.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
3 files changed, 4 insertions, 3 deletions
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" |