From eb186d18dcf19a8410238d542b31ffdd7beb991e Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 23 Dec 2008 20:13:31 +0000 Subject: 2.5 / SCons Blender builds and links on Linux. For now without BGE and its player, but that will come. Priorities are still a mess, so expect more commits soon. --- source/blender/editors/animation/SConscript | 2 +- source/blender/editors/datafiles/SConscript | 2 +- source/blender/editors/interface/SConscript | 2 +- source/blender/editors/screen/SConscript | 2 +- source/blender/editors/space_action/SConscript | 2 +- source/blender/editors/space_api/SConscript | 2 +- source/blender/editors/space_buttons/SConscript | 2 +- source/blender/editors/space_file/SConscript | 2 +- source/blender/editors/space_image/SConscript | 2 +- source/blender/editors/space_info/SConscript | 2 +- source/blender/editors/space_ipo/SConscript | 2 +- source/blender/editors/space_nla/SConscript | 2 +- source/blender/editors/space_node/SConscript | 2 +- source/blender/editors/space_outliner/SConscript | 2 +- source/blender/editors/space_script/SConscript | 2 +- source/blender/editors/space_sequencer/SConscript | 2 +- source/blender/editors/space_sound/SConscript | 2 +- source/blender/editors/space_text/SConscript | 2 +- source/blender/editors/space_time/SConscript | 2 +- source/blender/editors/space_view3d/SConscript | 2 +- source/blender/editors/util/SConscript | 2 +- source/blender/ftfont/SConscript | 2 +- source/blender/makesdna/SConscript | 2 +- source/blender/windowmanager/SConscript | 2 +- source/blender/yafray/SConscript | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) (limited to 'source') diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index b972cdf2256..4597a612c7c 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript index e69c8567ca0..bf10c866921 100644 --- a/source/blender/editors/datafiles/SConscript +++ b/source/blender/editors/datafiles/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core','intern'], priority=[50, 55] ) +env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core'], priority=[250] ) diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 908fcc62735..b96299a9645 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=[45, 50] ) +env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[60] ) diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 48f8fb5c593..b25c33cee34 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'], priority=[50] ) +env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[55] ) diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript index 01684e1c2ee..0e8f93f5766 100644 --- a/source/blender/editors/space_action/SConscript +++ b/source/blender/editors/space_action/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core','intern'], priority=[33, 37] ) +env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[33] ) diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript index 533c3d8b4d3..c3105d3e50c 100644 --- a/source/blender/editors/space_api/SConscript +++ b/source/blender/editors/space_api/SConscript @@ -12,4 +12,4 @@ defs = '' if not env['WITH_BF_PYTHON']: defs += 'DISABLE_PYTHON' -env.BlenderLib ( 'bf_editors_space_api', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[30, 35] ) +env.BlenderLib ( 'bf_editors_space_api', sources, Split(incs), Split(defs), libtype=['core'], priority=[30] ) diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript index eb3e6bda207..d034160ff43 100644 --- a/source/blender/editors/space_buttons/SConscript +++ b/source/blender/editors/space_buttons/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), [], libtype=['core'], priority=[70] ) diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index 832fbc296aa..166dca854bb 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), [], libtype=['core'], priority=[65] ) diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 6ecba4acb03..2a336489d58 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_info/SConscript b/source/blender/editors/space_info/SConscript index c967cf9c4b6..9bcaaf4bdc6 100644 --- a/source/blender/editors/space_info/SConscript +++ b/source/blender/editors/space_info/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_ipo/SConscript b/source/blender/editors/space_ipo/SConscript index 801501d635e..9601b5da65b 100644 --- a/source/blender/editors/space_ipo/SConscript +++ b/source/blender/editors/space_ipo/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_ipo', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_ipo', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_nla/SConscript b/source/blender/editors/space_nla/SConscript index 3be15b917f6..4601db94fef 100644 --- a/source/blender/editors/space_nla/SConscript +++ b/source/blender/editors/space_nla/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 95b0f28bd89..bba7e21c3b1 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -12,4 +12,4 @@ if env['OURPLATFORM'] == 'win32-vc': #cf.append('/Wall') cf.append('/WX') -env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core','intern'], priority=[35, 40], compileflags=cf ) +env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[35], compileflags=cf ) diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript index f5d6ddc76d3..df48b65a71f 100644 --- a/source/blender/editors/space_outliner/SConscript +++ b/source/blender/editors/space_outliner/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna' incs += ' #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_outliner', sources, Split(incs), [], libtype=['core', 'intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_outliner', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript index 1bea5b3f3b8..49cb48fa395 100644 --- a/source/blender/editors/space_script/SConscript +++ b/source/blender/editors/space_script/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 33e389c880e..974ab1c9aa7 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_sound/SConscript b/source/blender/editors/space_sound/SConscript index 0a45072ca49..7ea83622d58 100644 --- a/source/blender/editors/space_sound/SConscript +++ b/source/blender/editors/space_sound/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_sound', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_sound', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript index db6fcd6b64c..0d07a9b00fd 100644 --- a/source/blender/editors/space_text/SConscript +++ b/source/blender/editors/space_text/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript index 5295aa25e28..1c9eb5e7ced 100644 --- a/source/blender/editors/space_time/SConscript +++ b/source/blender/editors/space_time/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' -env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 4d9d484ffa1..2f21fb7b54c 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -8,4 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' incs += ' ../../gpu ../../makesrna' -env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[33, 38] ) +env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core'], priority=[33] ) diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index 48b0a99d889..891c271bb7f 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' -env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core','intern'], priority=[40, 45] ) +env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[140] ) diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 5bc84504f41..02c61018dd8 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=['core','player'], priority=[0, 205] ) +env.BlenderLib ( 'bf_ftfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[220] ) diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index c00b80d9311..e06d5098065 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=['core','player'], priority = [10, 215] ) +env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [260, 215] ) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 2d078988b9f..c4a6cba90b2 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -13,4 +13,4 @@ incs += ' ../makesrna ../gpu' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' incs += ' #/intern/elbeem #/extern/glew/include' -env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[45, 45] ) +env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core'], priority=[5] ) diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript index c5161a96692..61d4dffb780 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=['core','player'], priority=[5, 190] ) +env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['core'], priority=[190] ) -- cgit v1.2.3