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 | |
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.
-rw-r--r-- | SConstruct | 8 | ||||
-rw-r--r-- | extern/bFTGL/SConscript | 2 | ||||
-rw-r--r-- | extern/bullet2/src/SConscript | 16 | ||||
-rw-r--r-- | extern/glew/SConscript | 2 | ||||
-rw-r--r-- | intern/SoundSystem/SConscript | 2 | ||||
-rw-r--r-- | intern/boolop/SConscript | 4 | ||||
-rw-r--r-- | intern/decimation/SConscript | 2 | ||||
-rw-r--r-- | intern/elbeem/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | intern/moto/SConscript | 2 | ||||
-rw-r--r-- | intern/opennl/SConscript | 4 | ||||
-rw-r--r-- | intern/string/SConscript | 2 | ||||
-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 | ||||
-rw-r--r-- | source/blender/ftfont/SConscript | 2 | ||||
-rw-r--r-- | source/blender/makesdna/SConscript | 2 | ||||
-rw-r--r-- | source/blender/makesrna/SConscript | 2 | ||||
-rw-r--r-- | source/blender/readblenfile/SConscript | 2 | ||||
-rw-r--r-- | source/blender/yafray/SConscript | 2 | ||||
-rw-r--r-- | source/kernel/SConscript | 2 |
21 files changed, 39 insertions, 35 deletions
diff --git a/SConstruct b/SConstruct index 6cd89671bd9..03373ab63cf 100644 --- a/SConstruct +++ b/SConstruct @@ -56,9 +56,7 @@ nsis_build = None ##### BEGIN SETUP ##### -B.possible_types = ['core', 'common', 'blender', 'intern', - 'international', 'game', 'game2', - 'player', 'player2', 'system'] +B.possible_types = ['core', 'player', 'intern', 'extern'] B.binarykind = ['blender' , 'blenderplayer'] ################################## @@ -386,10 +384,10 @@ thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: - env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') - env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') + env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') ##### Now define some targets diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript index f377c61f01d..d1229bf7265 100644 --- a/extern/bFTGL/SConscript +++ b/extern/bFTGL/SConscript @@ -9,4 +9,4 @@ defs = '' sources = env.Glob('src/*.cpp') -env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[5, 210]) +env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[5, 210]) diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 203407569b1..702f74e66e7 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -35,11 +35,11 @@ softbody_src = env.Glob("BulletSoftBody/*.cpp") incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' -env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[19, 169], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 175], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[18,168], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[19, 169], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[25, 175], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[18,168], compileflags=cflags ) diff --git a/extern/glew/SConscript b/extern/glew/SConscript index 3badbeb040e..0d09be945cc 100644 --- a/extern/glew/SConscript +++ b/extern/glew/SConscript @@ -9,4 +9,4 @@ sources = ['src/glew.c'] defs = '' incs = 'include' -env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['blender', 'player'], priority=[50, 50]) +env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern', 'player'], priority=[50, 50]) diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index 2be20a24042..256b7904a0f 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -17,4 +17,4 @@ else: if not env['WITH_BF_SDL']: defs += ' DISABLE_SDL' -env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] ) +env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [25,135] ) diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript index a3f3c0b6433..6a85b2d69be 100644 --- a/intern/boolop/SConscript +++ b/intern/boolop/SConscript @@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc' incs += ' ../../source/blender/blenlib' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] ) + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 ) else: - env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 ) + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 ) diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 2dd2ac38498..55de37f3c69 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = '. ../moto/include ../container ../memutil' -env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 20] ) +env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['intern', 'player'], priority = [10, 20] ) diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index dc8d84ef5a0..92e80c36cea 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -15,4 +15,4 @@ if env['OURPLATFORM']=='win32-vc': incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' extern ' -env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 ) +env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 ) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index ad6b4ff51ba..dc442b3bb54 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -29,4 +29,4 @@ else: incs = '. ../string ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): incs = env['BF_WINTAB_INC'] + ' ' + incs -env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] ) +env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] ) diff --git a/intern/moto/SConscript b/intern/moto/SConscript index 4152633e393..5af9566c896 100644 --- a/intern/moto/SConscript +++ b/intern/moto/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = 'include' -env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 60, 130] ) +env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern', 'player'], priority = [15, 130] ) diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript index e5f5d12c7d7..8cd5f9c1548 100644 --- a/intern/opennl/SConscript +++ b/intern/opennl/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') incs = 'extern superlu' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern','player'], priority=[1,80,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['intern','player'], priority=[80,22] ) else: - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','player'], priority=[65,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['intern','player'], priority=[65,22] ) diff --git a/intern/string/SConscript b/intern/string/SConscript index 292ddf5aa63..8973ac88a66 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,4 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'common','player'], priority = [50,19,0] ) +env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern'], priority = [50] ) 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] ) diff --git a/source/kernel/SConscript b/source/kernel/SConscript index 8bd1a18f835..21584583844 100644 --- a/source/kernel/SConscript +++ b/source/kernel/SConscript @@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp' incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader ' -env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] ) +env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [15, 150] ) |