diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-04 14:40:41 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-04 14:40:41 +0400 |
| commit | bade641408882919ef3f22b3d5223d533678120c (patch) | |
| tree | bb5cbb5301de6ee285cb76b43dc4df2f303895c6 /SConstruct | |
| parent | 6ed49857a4408bf413f4bf626229aa00d6c8cad7 (diff) | |
== SCons ==
* first working changes to get blenderplayer linking
* blenderplayer/ moved into source/ (CMakeLists.txt changed for that too)
* added externs for bprogname to gp_ghost, so that it links properly
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index a66587695f3..b3291c37e1a 100644 --- a/SConstruct +++ b/SConstruct @@ -390,7 +390,7 @@ SConscript(B.root_build_dir+'/source/SConscript') # libraries to give as objects to linking phase mainlist = [] for tp in B.possible_types: - if not tp == 'player' and not tp == 'player2': + if not tp == 'player': mainlist += B.create_blender_liblist(env, tp) if B.arguments.get('BF_PRIORITYLIST', '0')=='1': @@ -404,6 +404,7 @@ 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') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') + playerlist = playerlist[0:2] + [playerlist[3]] + mainlist[2:] + [playerlist[29]] env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') ##### Now define some targets |