[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23013] branches/blender2.5/blender: == SCons ==
Nathan Letwory
jesterking at letwory.net
Sat Sep 5 03:58:03 CEST 2009
Revision: 23013
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23013
Author: jesterking
Date: 2009-09-05 03:58:02 +0200 (Sat, 05 Sep 2009)
Log Message:
-----------
== SCons ==
* bring back 'player' libtype, after investigation with ideasman.
scons/mingw works nicely, for some reason msvc fails to link still, will look further into it.
Modified Paths:
--------------
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/extern/binreloc/SConscript
branches/blender2.5/blender/extern/bullet2/src/SConscript
branches/blender2.5/blender/extern/glew/SConscript
branches/blender2.5/blender/extern/libopenjpeg/SConscript
branches/blender2.5/blender/intern/audaspace/SConscript
branches/blender2.5/blender/intern/ghost/SConscript
branches/blender2.5/blender/intern/guardedalloc/SConscript
branches/blender2.5/blender/intern/iksolver/SConscript
branches/blender2.5/blender/intern/memutil/SConscript
branches/blender2.5/blender/intern/moto/SConscript
branches/blender2.5/blender/intern/string/SConscript
branches/blender2.5/blender/source/blender/avi/SConscript
branches/blender2.5/blender/source/blender/blenfont/SConscript
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenloader/SConscript
branches/blender2.5/blender/source/blender/gpu/SConscript
branches/blender2.5/blender/source/blender/imbuf/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/dds/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript
branches/blender2.5/blender/source/blender/makesdna/SConscript
branches/blender2.5/blender/source/blender/makesrna/SConscript
branches/blender2.5/blender/source/blender/nodes/SConscript
branches/blender2.5/blender/source/blender/python/SConscript
branches/blender2.5/blender/source/blender/quicktime/SConscript
branches/blender2.5/blender/source/blender/readblenfile/SConscript
branches/blender2.5/blender/source/blenderplayer/bad_level_call_stubs/SConscript
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Network/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SConscript
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
branches/blender2.5/blender/source/kernel/SConscript
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/SConstruct 2009-09-05 01:58:02 UTC (rev 23013)
@@ -404,7 +404,7 @@
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] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
+ #playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets
Modified: branches/blender2.5/blender/extern/binreloc/SConscript
===================================================================
--- branches/blender2.5/blender/extern/binreloc/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/extern/binreloc/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -9,5 +9,5 @@
sources = ['binreloc.c']
incs = 'include'
-env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern'], priority=[36], compileflags = cflags)
+env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[36,225], compileflags = cflags)
Modified: branches/blender2.5/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/extern/bullet2/src/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -35,11 +35,11 @@
incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[19], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[25], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[20], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[18], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[19,136], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[25,145], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[18,135], compileflags=cflags )
Modified: branches/blender2.5/blender/extern/glew/SConscript
===================================================================
--- branches/blender2.5/blender/extern/glew/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/extern/glew/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -9,4 +9,4 @@
defs = ''
incs = 'include'
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern'], priority=[50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[50,230])
Modified: branches/blender2.5/blender/extern/libopenjpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/libopenjpeg/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/extern/libopenjpeg/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -24,5 +24,5 @@
oj_env.BlenderLib ( libname='extern_openjpeg',
sources=sources, includes=Split(incs),
defines=defs,
- libtype=['extern'],
- priority=[10], compileflags = flags)
+ libtype=['extern','player'],
+ priority=[10,185], compileflags = flags)
Modified: branches/blender2.5/blender/intern/audaspace/SConscript
===================================================================
--- branches/blender2.5/blender/intern/audaspace/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/audaspace/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -31,4 +31,4 @@
incs += ' sndfile ' + env['BF_SNDFILE_INC']
defs.append('WITH_SNDFILE')
-env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
+env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
Modified: branches/blender2.5/blender/intern/ghost/SConscript
===================================================================
--- branches/blender2.5/blender/intern/ghost/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/ghost/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -29,4 +29,4 @@
incs = '. ../string ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] )
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern','player'], priority = [40,15] )
Modified: branches/blender2.5/blender/intern/guardedalloc/SConscript
===================================================================
--- branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -5,4 +5,4 @@
sources = env.Glob('intern/*.c')
incs = '.'
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern'], priority = [5] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
Modified: branches/blender2.5/blender/intern/iksolver/SConscript
===================================================================
--- branches/blender2.5/blender/intern/iksolver/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/iksolver/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -5,5 +5,5 @@
incs = 'intern ../moto/include ../memutil'
-env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern'], priority=[100] )
+env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
Modified: branches/blender2.5/blender/intern/memutil/SConscript
===================================================================
--- branches/blender2.5/blender/intern/memutil/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/memutil/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -5,4 +5,4 @@
incs = '. ..'
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern'], priority = [0] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern','player'], priority = [0,155] )
Modified: branches/blender2.5/blender/intern/moto/SConscript
===================================================================
--- branches/blender2.5/blender/intern/moto/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
+++ branches/blender2.5/blender/intern/moto/SConscript 2009-09-05 01:58:02 UTC (rev 23013)
@@ -5,4 +5,4 @@
incs = 'include'
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern'], priority = [130] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','player'], priority = [130,95] )
Modified: branches/blender2.5/blender/intern/string/SConscript
===================================================================
--- branches/blender2.5/blender/intern/string/SConscript 2009-09-04 23:22:46 UTC (rev 23012)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list