diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 7c874fbd55a..329f51f85ad 100644 --- a/SConstruct +++ b/SConstruct @@ -70,7 +70,7 @@ quickdebug = None ##### BEGIN SETUP ##### -B.possible_types = ['core', 'player', 'player2', 'intern', 'extern'] +B.possible_types = ['core', 'player', 'player2', 'intern', 'extern', 'system'] B.binarykind = ['blender' , 'blenderplayer'] ################################## @@ -815,7 +815,7 @@ SConscript(B.root_build_dir+'/extern/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') and (not tp == 'player2') and (not tp == 'system'): mainlist += B.create_blender_liblist(env, tp) if B.arguments.get('BF_PRIORITYLIST', '0')=='1': @@ -826,6 +826,11 @@ creob = B.creator(env) thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) +# Hack to pass OSD libraries to linker before extern_{clew,cuew} +for x in B.create_blender_liblist(env, 'system'): + thesyslibs.append(os.path.basename(x)) + thelibincs.append(os.path.dirname(x)) + if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: env.BlenderProg(B.root_build_dir, "blender", creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: |