[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33825] trunk/blender: Workaround for blenderplayer not linking on linux with scons.

[Nathan Letwory]

Revision: 33825
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33825
Author:   jesterking
Date:     2010-12-21 01:21:42 +0100 (Tue, 21 Dec 2010)

Log Message:
-----------
Workaround for blenderplayer not linking on linux with scons.

Maybe as a next big, uncool project would be: solve bad level calls.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/blenloader/SConscript
    trunk/blender/source/blender/modifiers/SConscript
    trunk/blender/source/blender/readblenfile/SConscript

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/SConstruct	2010-12-21 00:21:42 UTC (rev 33825)
@@ -70,7 +70,7 @@
 
 ##### 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 @@
 # 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 @@
     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')

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/source/blender/blenkernel/SConscript	2010-12-21 00:21:42 UTC (rev 33825)
@@ -91,4 +91,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25]) #, cc_compileflags = env['CCFLAGS'].append('/WX') )
 else:
-    env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] )
+    env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player', 'player2'], priority = [166,25,0] )

Modified: trunk/blender/source/blender/blenloader/SConscript
===================================================================
--- trunk/blender/source/blender/blenloader/SConscript	2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/source/blender/blenloader/SConscript	2010-12-21 00:21:42 UTC (rev 33825)
@@ -14,4 +14,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30]) #, cc_compileflags=['/WX'] )
 else:
-    env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30] )
+    env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player','player2'], priority = [167,30,5] )

Modified: trunk/blender/source/blender/modifiers/SConscript
===================================================================
--- trunk/blender/source/blender/modifiers/SConscript	2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/source/blender/modifiers/SConscript	2010-12-21 00:21:42 UTC (rev 33825)
@@ -21,4 +21,4 @@
 
 env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
                  includes = Split(incs), defines=defs,
-                 libtype=['core','player'], priority = [180, 20] )
+                 libtype=['core','player'], priority = [180, 40] )

Modified: trunk/blender/source/blender/readblenfile/SConscript
===================================================================
--- trunk/blender/source/blender/readblenfile/SConscript	2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/source/blender/readblenfile/SConscript	2010-12-21 00:21:42 UTC (rev 33825)
@@ -5,4 +5,4 @@
 
 incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
 
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,195] )
+env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,5] )