[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18030] branches/blender2.5/blender: 2.5 / SCons
Nathan Letwory
jesterking at letwory.net
Tue Dec 23 17:07:27 CET 2008
Revision: 18030
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18030
Author: jesterking
Date: 2008-12-23 17:07:24 +0100 (Tue, 23 Dec 2008)
Log Message:
-----------
2.5 / SCons
I did a very drastic cleanup for the different libgroups, there's now only a few left. It compiled with scons/msvc, will be testing in a bit on linux, too.
If you get any problems, please reply to this commit message on the taskforce ML.
Modified Paths:
--------------
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/extern/bFTGL/SConscript
branches/blender2.5/blender/extern/bullet2/src/SConscript
branches/blender2.5/blender/extern/glew/SConscript
branches/blender2.5/blender/intern/SoundSystem/SConscript
branches/blender2.5/blender/intern/boolop/SConscript
branches/blender2.5/blender/intern/decimation/SConscript
branches/blender2.5/blender/intern/elbeem/SConscript
branches/blender2.5/blender/intern/ghost/SConscript
branches/blender2.5/blender/intern/moto/SConscript
branches/blender2.5/blender/intern/opennl/SConscript
branches/blender2.5/blender/intern/string/SConscript
branches/blender2.5/blender/source/blender/editors/interface/SConscript
branches/blender2.5/blender/source/blender/editors/screen/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
branches/blender2.5/blender/source/blender/ftfont/SConscript
branches/blender2.5/blender/source/blender/makesdna/SConscript
branches/blender2.5/blender/source/blender/makesrna/SConscript
branches/blender2.5/blender/source/blender/readblenfile/SConscript
branches/blender2.5/blender/source/blender/yafray/SConscript
branches/blender2.5/blender/source/kernel/SConscript
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/SConstruct 2008-12-23 16:07:24 UTC (rev 18030)
@@ -56,9 +56,7 @@
##### BEGIN SETUP #####
-B.possible_types = ['core', 'common', 'blender', 'intern',
- 'international', 'game', 'game2',
- 'player', 'player2', 'system']
+B.possible_types = ['core', 'player', 'intern', 'extern']
B.binarykind = ['blender' , 'blenderplayer']
##################################
@@ -386,10 +384,10 @@
thesyslibs = B.setup_syslibs(env)
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
- env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+ 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')
- env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+ 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/bFTGL/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bFTGL/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/extern/bFTGL/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -9,4 +9,4 @@
sources = env.Glob('src/*.cpp')
-env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[5, 210])
+env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[5, 210])
Modified: branches/blender2.5/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -35,11 +35,11 @@
incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[19, 169], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 175], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[18,168], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[19, 169], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[25, 175], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[18,168], compileflags=cflags )
Modified: branches/blender2.5/blender/extern/glew/SConscript
===================================================================
--- branches/blender2.5/blender/extern/glew/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/extern/glew/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -9,4 +9,4 @@
defs = ''
incs = 'include'
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['blender', 'player'], priority=[50, 50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern', 'player'], priority=[50, 50])
Modified: branches/blender2.5/blender/intern/SoundSystem/SConscript
===================================================================
--- branches/blender2.5/blender/intern/SoundSystem/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/SoundSystem/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -17,4 +17,4 @@
if not env['WITH_BF_SDL']:
defs += ' DISABLE_SDL'
-env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] )
+env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [25,135] )
Modified: branches/blender2.5/blender/intern/boolop/SConscript
===================================================================
--- branches/blender2.5/blender/intern/boolop/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/boolop/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -8,7 +8,7 @@
incs += ' ../../source/blender/blenlib'
if (env['OURPLATFORM'] == 'win32-mingw'):
- env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+ env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
else:
- env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
+ env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
Modified: branches/blender2.5/blender/intern/decimation/SConscript
===================================================================
--- branches/blender2.5/blender/intern/decimation/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/decimation/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -5,4 +5,4 @@
incs = '. ../moto/include ../container ../memutil'
-env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 20] )
+env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['intern', 'player'], priority = [10, 20] )
Modified: branches/blender2.5/blender/intern/elbeem/SConscript
===================================================================
--- branches/blender2.5/blender/intern/elbeem/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/elbeem/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -15,4 +15,4 @@
incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
incs += ' extern '
-env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )
+env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 )
Modified: branches/blender2.5/blender/intern/ghost/SConscript
===================================================================
--- branches/blender2.5/blender/intern/ghost/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/ghost/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -29,4 +29,4 @@
incs = '. ../string ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] )
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] )
Modified: branches/blender2.5/blender/intern/moto/SConscript
===================================================================
--- branches/blender2.5/blender/intern/moto/SConscript 2008-12-23 15:53:46 UTC (rev 18029)
+++ branches/blender2.5/blender/intern/moto/SConscript 2008-12-23 16:07:24 UTC (rev 18030)
@@ -5,4 +5,4 @@
incs = 'include'
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 60, 130] )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list