* 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.
This commit is contained in:
parent
6c7b60668b
commit
c2acbef851
@ -13,7 +13,8 @@ SConscript(['avi/SConscript',
|
|||||||
'radiosity/SConscript',
|
'radiosity/SConscript',
|
||||||
'readblenfile/SConscript',
|
'readblenfile/SConscript',
|
||||||
'render/SConscript',
|
'render/SConscript',
|
||||||
'nodes/SConscript'])
|
'nodes/SConscript',
|
||||||
|
'windowmanager/SConscript'])
|
||||||
|
|
||||||
if env['WITH_BF_YAFRAY'] == 1:
|
if env['WITH_BF_YAFRAY'] == 1:
|
||||||
SConscript(['yafray/SConscript'])
|
SConscript(['yafray/SConscript'])
|
||||||
|
@ -3,7 +3,7 @@ Import ('env')
|
|||||||
|
|
||||||
sources = env.Glob('intern/*.c')
|
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 += ' ../python ../render/extern/include #/intern/decimation/extern'
|
||||||
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
|
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
|
||||||
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
|
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#include "BLI_blenlib.h"
|
#include "BLI_blenlib.h"
|
||||||
#include "DNA_userdef_types.h"
|
#include "DNA_userdef_types.h"
|
||||||
|
|
||||||
#include "BKE_bad_level_calls.h"
|
/*#include "BKE_bad_level_calls.h"*/
|
||||||
#include "BKE_global.h"
|
#include "BKE_global.h"
|
||||||
|
|
||||||
#include "IMB_imbuf_types.h"
|
#include "IMB_imbuf_types.h"
|
||||||
|
@ -4,7 +4,7 @@ Import ('env')
|
|||||||
sources = env.Glob('intern/*.c')
|
sources = env.Glob('intern/*.c')
|
||||||
|
|
||||||
cflags=''
|
cflags=''
|
||||||
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include'
|
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include'
|
||||||
incs += ' ' + env['BF_FREETYPE_INC']
|
incs += ' ' + env['BF_FREETYPE_INC']
|
||||||
incs += ' ' + env['BF_ZLIB_INC']
|
incs += ' ' + env['BF_ZLIB_INC']
|
||||||
incs += ' ' + env['BF_SDL_INC']
|
incs += ' ' + env['BF_SDL_INC']
|
||||||
|
@ -4,7 +4,7 @@ Import ('env')
|
|||||||
sources = env.Glob('intern/*.c')
|
sources = env.Glob('intern/*.c')
|
||||||
|
|
||||||
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
|
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
|
||||||
incs += ' ../makesdna ../readblenfile ../include'
|
incs += ' ../makesdna ../readblenfile ../editors/include'
|
||||||
incs += ' ../python ../../kernel/gen_messaging'
|
incs += ' ../python ../../kernel/gen_messaging'
|
||||||
incs += ' ../render/extern/include'
|
incs += ' ../render/extern/include'
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ Import ('env')
|
|||||||
|
|
||||||
sources = env.Glob('intern/*.cpp')
|
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_FTGL_INC']
|
||||||
incs += ' ' + env['BF_FREETYPE_INC']
|
incs += ' ' + env['BF_FREETYPE_INC']
|
||||||
incs += ' ' + env['BF_GETTEXT_INC']
|
incs += ' ' + env['BF_GETTEXT_INC']
|
||||||
|
@ -6,7 +6,7 @@ sources += env.Glob('intern/CMP_nodes/*.c')
|
|||||||
sources += env.Glob('intern/SHD_nodes/*.c')
|
sources += env.Glob('intern/SHD_nodes/*.c')
|
||||||
|
|
||||||
incs = '. ./intern '
|
incs = '. ./intern '
|
||||||
incs += '#/intern/guardedalloc ../include ../blenlib ../makesdna'
|
incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
|
||||||
incs += ' ../python ../render/extern/include '
|
incs += ' ../python ../render/extern/include '
|
||||||
incs += ' ../imbuf ../avi '
|
incs += ' ../imbuf ../avi '
|
||||||
incs += ' ../blenloader ../quicktime'
|
incs += ' ../blenloader ../quicktime'
|
||||||
|
@ -3,7 +3,7 @@ Import ('env')
|
|||||||
|
|
||||||
sources = env.Glob('intern/source/*.c')
|
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 += ' #/intern/guardedalloc ../render/extern/include'
|
||||||
incs += ' ../render/intern/include'
|
incs += ' ../render/intern/include'
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c')
|
|||||||
|
|
||||||
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
|
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
|
||||||
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
|
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
|
||||||
incs += ' ../quicktime ../include ../../kernel/gen_messaging'
|
incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging'
|
||||||
|
|
||||||
defs = []
|
defs = []
|
||||||
|
|
||||||
|
15
source/blender/windowmanager/SConscript
Normal file
15
source/blender/windowmanager/SConscript
Normal file
@ -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] )
|
@ -4,6 +4,6 @@ Import ('env')
|
|||||||
sources = env.Glob('intern/*.cpp')
|
sources = env.Glob('intern/*.cpp')
|
||||||
|
|
||||||
incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
|
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] )
|
env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
|
||||||
|
@ -4,8 +4,8 @@ Import ('env')
|
|||||||
sources = 'creator.c'
|
sources = 'creator.c'
|
||||||
|
|
||||||
incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
|
incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
|
||||||
incs += ' ../blender/include ../blender/blenloader ../blender/imbuf'
|
incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf'
|
||||||
incs += ' ../blender/renderconverter ../blender/render/extern/include'
|
incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager'
|
||||||
incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
|
incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
|
||||||
incs += ' ../kernel/gen_system'
|
incs += ' ../kernel/gen_system'
|
||||||
incs += ' ' + env['BF_OPENGL_INC']
|
incs += ' ' + env['BF_OPENGL_INC']
|
||||||
|
Loading…
Reference in New Issue
Block a user