diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-12-28 01:16:54 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-12-28 01:16:54 +0300 |
commit | c2acbef851fff76d7b15aab89ce031589d7a8488 (patch) | |
tree | 6509963f331a31237ed3bbb1bd134ad2bc06d999 | |
parent | 6c7b60668b122414299d1a34263395e169b7ffeb (diff) |
* added SConscript for windowmanager
* tweak other SConscripts for editors/include
* commented BKE_bad_level_calls.h in writeframeserver.c - please check it doesn't break make builds
This compiles until final linking, which still fails.
-rw-r--r-- | source/blender/SConscript | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeframeserver.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenloader/SConscript | 2 | ||||
-rw-r--r-- | source/blender/ftfont/SConscript | 2 | ||||
-rw-r--r-- | source/blender/nodes/SConscript | 2 | ||||
-rw-r--r-- | source/blender/radiosity/SConscript | 2 | ||||
-rw-r--r-- | source/blender/render/SConscript | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/SConscript | 15 | ||||
-rw-r--r-- | source/blender/yafray/SConscript | 2 | ||||
-rw-r--r-- | source/creator/SConscript | 4 |
12 files changed, 28 insertions, 12 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 94c637e97fa..e4c78373ef5 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -13,7 +13,8 @@ SConscript(['avi/SConscript', 'radiosity/SConscript', 'readblenfile/SConscript', 'render/SConscript', - 'nodes/SConscript']) + 'nodes/SConscript', + 'windowmanager/SConscript']) if env['WITH_BF_YAFRAY'] == 1: SConscript(['yafray/SConscript']) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 9ecc76046c7..75023f17d0f 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna' +incs = '. #/intern/guardedalloc ../editors/include ../blenlib ../makesdna' incs += ' ../python ../render/extern/include #/intern/decimation/extern' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' #/intern/iksolver/extern ../blenloader ../quicktime' diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 6b38d7deadb..d67d16fdba8 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -47,7 +47,7 @@ #include "BLI_blenlib.h" #include "DNA_userdef_types.h" -#include "BKE_bad_level_calls.h" +/*#include "BKE_bad_level_calls.h"*/ #include "BKE_global.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index e11934d968e..23d06404f1b 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') cflags='' -incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include' +incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_SDL_INC'] diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index fb36b15e3e7..097f54af7ae 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc ../blenlib ../blenkernel' -incs += ' ../makesdna ../readblenfile ../include' +incs += ' ../makesdna ../readblenfile ../editors/include' incs += ' ../python ../../kernel/gen_messaging' incs += ' ../render/extern/include' diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 615b274677c..aab303a1fd2 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.cpp') -incs = '. intern ../blenkernel ../blenlib ../makesdna ../include' +incs = '. intern ../blenkernel ../blenlib ../makesdna ../editors/include' incs += ' ' + env['BF_FTGL_INC'] incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 0460848b4a5..0020094c6ea 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -6,7 +6,7 @@ sources += env.Glob('intern/CMP_nodes/*.c') sources += env.Glob('intern/SHD_nodes/*.c') incs = '. ./intern ' -incs += '#/intern/guardedalloc ../include ../blenlib ../makesdna' +incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna' incs += ' ../python ../render/extern/include ' incs += ' ../imbuf ../avi ' incs += ' ../blenloader ../quicktime' diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript index 102f79683f9..a3e2e7cafba 100644 --- a/source/blender/radiosity/SConscript +++ b/source/blender/radiosity/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('intern/source/*.c') -incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../include' +incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../editors/include' incs += ' #/intern/guardedalloc ../render/extern/include' incs += ' ../render/intern/include' diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index b1bc9673f23..e1e43eb7830 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../quicktime ../include ../../kernel/gen_messaging' +incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging' defs = [] diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript new file mode 100644 index 00000000000..420cfed426f --- /dev/null +++ b/source/blender/windowmanager/SConscript @@ -0,0 +1,15 @@ +#!/usr/bin/python +Import ('env') + +sources = env.Glob('intern/*.c') + +#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' +#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include' + +incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' +incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' +incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system' + +incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' +incs += ' #/intern/elbeem' +env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] ) diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript index dd744f92d39..1f8d39cbab1 100644 --- a/source/blender/yafray/SConscript +++ b/source/blender/yafray/SConscript @@ -4,6 +4,6 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' -incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include' +incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include' env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] ) diff --git a/source/creator/SConscript b/source/creator/SConscript index 9bc49b2fc30..7ff3937e86f 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -4,8 +4,8 @@ Import ('env') sources = 'creator.c' incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel' -incs += ' ../blender/include ../blender/blenloader ../blender/imbuf' -incs += ' ../blender/renderconverter ../blender/render/extern/include' +incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf' +incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager' incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging' incs += ' ../kernel/gen_system' incs += ' ' + env['BF_OPENGL_INC'] |