diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 03:21:42 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 03:21:42 +0300 |
commit | a8febab31bb82d393a12a29ef9ad35c8a13c234e (patch) | |
tree | 9589ca35206880b180a1132b82864bd4bd57a36f /SConstruct | |
parent | a9ba96896a627688be3359bf6a9d7e25995aa631 (diff) |
Workaround for blenderplayer not linking on linux with scons.
Maybe as a next big, uncool project would be: solve bad level calls.
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 12926a29cef..7b6f6f2fcf7 100644 --- a/SConstruct +++ b/SConstruct @@ -70,7 +70,7 @@ quickdebug = None ##### BEGIN SETUP ##### -B.possible_types = ['core', 'player', 'intern', 'extern'] +B.possible_types = ['core', 'player', 'player2', 'intern', 'extern'] B.binarykind = ['blender' , 'blenderplayer'] ################################## @@ -395,7 +395,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': + if (not tp == 'player') and (not tp == 'player2'): mainlist += B.create_blender_liblist(env, tp) if B.arguments.get('BF_PRIORITYLIST', '0')=='1': @@ -409,6 +409,7 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') + playerlist += B.create_blender_liblist(env, 'player2') playerlist += B.create_blender_liblist(env, 'intern') playerlist += B.create_blender_liblist(env, 'extern') env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') |