Nathan, that would be a great idea.
A question for scons people, do you still need the commit 32719 to link in
scons or it can be reverted (i.e. re-reverting 32710) ? For CMake+MSVC the
32710 seems to be necessary (although for cmake+gcc it works only as it's
now, after rev. 32719)
For quick catch up:
r32719 | jesterking | 2010-10-26 19:16:11 -0200 (Tue, 26 Oct 2010) | 1 line
Revert 32710 for now, otherwise can't test release building with scons.
r32710 | dfelinto | 2010-10-25 23:55:06 -0200 (Mon, 25 Oct 2010) | 2 lines
blenderplayer building again in CMake+MSVC
(I basically commented out functions already defined in other places)
Cheers,
Dalai
2010/12/20 Nathan Letwory nat...@letworyinteractive.com
Revision: 33825
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=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/SConstruct2010-12-20 23:26:29 UTC (rev 33824)
+++ trunk/blender/SConstruct2010-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