diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-12-23 19:07:24 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-12-23 19:07:24 +0300 |
| commit | 93d9e7749df0a9fd89360ca9347f2fce1ac5dc29 (patch) | |
| tree | 9183ec9011d332d5a7357ef34cca59931e543303 /source/blender/editors | |
| parent | efe6acb58aea0a89716a71c4bc9b06f5ed77e16f (diff) | |
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.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/SConscript | 10 |
3 files changed, 10 insertions, 4 deletions
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 ) |