From 93d9e7749df0a9fd89360ca9347f2fce1ac5dc29 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 23 Dec 2008 16:07:24 +0000 Subject: 2.5 / SCons I did a very drastic cleanup for the different libgroups, there's now only a few left. It compiled with scons/msvc, will be testing in a bit on linux, too. If you get any problems, please reply to this commit message on the taskforce ML. --- source/blender/editors/interface/SConscript | 2 +- source/blender/editors/screen/SConscript | 2 +- source/blender/editors/space_node/SConscript | 10 ++++++++-- source/blender/ftfont/SConscript | 2 +- source/blender/makesdna/SConscript | 2 +- source/blender/makesrna/SConscript | 2 +- source/blender/readblenfile/SConscript | 2 +- source/blender/yafray/SConscript | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 42e4db60edb..908fcc62735 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -14,4 +14,4 @@ if env['WITH_BF_INTERNATIONAL']: defs.append('INTERNATIONAL') defs.append('FTGL_STATIC_LIBRARY') -env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[40, 45] ) +env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[45, 50] ) diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index ce92a5454cb..48f8fb5c593 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -12,4 +12,4 @@ defs = '' if not env['WITH_BF_PYTHON']: defs += 'DISABLE_PYTHON' -env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[30, 35] ) +env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[50] ) diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 220ac809d4e..95b0f28bd89 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -4,6 +4,12 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' +incs += ' ../../nodes #intern/bmfont ../../render/extern/include' +incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' +defs = [] +cf = [] +if env['OURPLATFORM'] == 'win32-vc': + #cf.append('/Wall') + cf.append('/WX') -env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core','intern'], priority=[35, 40], compileflags=cf ) diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 9cdfbe41026..5bc84504f41 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -13,4 +13,4 @@ defs = 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' -env.BlenderLib ( 'bf_ftfont', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[0, 205] ) +env.BlenderLib ( 'bf_ftfont', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[0, 205] ) diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index cdb4caef8fd..c00b80d9311 100644 --- a/source/blender/makesdna/SConscript +++ b/source/blender/makesdna/SConscript @@ -8,4 +8,4 @@ objs += o incs = '#/intern/guardedalloc .' -env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['common','player'], priority = [10, 215] ) +env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [10, 215] ) diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index a580072895a..dd7514884e7 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -8,4 +8,4 @@ objs += o incs = '#/intern/guardedalloc ../blenkernel ../blenlib ../makesdna intern .' -env.BlenderLib ( 'bf_rna', objs, Split(incs), [], libtype=['common','intern'], priority = [95, 95] ) +env.BlenderLib ( 'bf_rna', objs, Split(incs), [], libtype=['core','intern'], priority = [95, 95] ) diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript index 31ca25eedd7..59771aa0829 100644 --- a/source/blender/readblenfile/SConscript +++ b/source/blender/readblenfile/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c') incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging' -env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] ) +env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 220] ) diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript index 1f8d39cbab1..c5161a96692 100644 --- a/source/blender/yafray/SConscript +++ b/source/blender/yafray/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('intern/*.cpp') incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' 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=['core','player'], priority=[5, 190] ) -- cgit v1.2.3