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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 3 insertions, 5 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 |