[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18032] branches/blender2.5/blender: 2.5 / SCons
Nathan Letwory
jesterking at letwory.net
Tue Dec 23 21:13:31 CET 2008
Revision: 18032
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18032
Author: jesterking
Date: 2008-12-23 21:13:31 +0100 (Tue, 23 Dec 2008)
Log Message:
-----------
2.5 / SCons
Blender builds and links on Linux. For now without BGE and its player,
but that will come. Priorities are still a mess, so expect more commits
soon.
Modified Paths:
--------------
branches/blender2.5/blender/extern/bFTGL/SConscript
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/iksolver/SConscript
branches/blender2.5/blender/intern/moto/SConscript
branches/blender2.5/blender/source/blender/editors/animation/SConscript
branches/blender2.5/blender/source/blender/editors/datafiles/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_action/SConscript
branches/blender2.5/blender/source/blender/editors/space_api/SConscript
branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript
branches/blender2.5/blender/source/blender/editors/space_file/SConscript
branches/blender2.5/blender/source/blender/editors/space_image/SConscript
branches/blender2.5/blender/source/blender/editors/space_info/SConscript
branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
branches/blender2.5/blender/source/blender/editors/space_nla/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
branches/blender2.5/blender/source/blender/editors/space_outliner/SConscript
branches/blender2.5/blender/source/blender/editors/space_script/SConscript
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
branches/blender2.5/blender/source/blender/editors/space_sound/SConscript
branches/blender2.5/blender/source/blender/editors/space_text/SConscript
branches/blender2.5/blender/source/blender/editors/space_time/SConscript
branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript
branches/blender2.5/blender/source/blender/editors/util/SConscript
branches/blender2.5/blender/source/blender/ftfont/SConscript
branches/blender2.5/blender/source/blender/makesdna/SConscript
branches/blender2.5/blender/source/blender/windowmanager/SConscript
branches/blender2.5/blender/source/blender/yafray/SConscript
Modified: branches/blender2.5/blender/extern/bFTGL/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bFTGL/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/extern/bFTGL/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -9,4 +9,4 @@
sources = env.Glob('src/*.cpp')
-env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[5, 210])
+env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern'], priority=[5])
Modified: branches/blender2.5/blender/extern/binreloc/SConscript
===================================================================
--- branches/blender2.5/blender/extern/binreloc/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/extern/binreloc/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -9,5 +9,5 @@
sources = ['binreloc.c']
incs = 'include'
-env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['intern','player'], priority=[36, 226], compileflags = cflags)
+env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern'], priority=[36], compileflags = cflags)
Modified: branches/blender2.5/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -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', '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 )
+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 )
Modified: branches/blender2.5/blender/extern/glew/SConscript
===================================================================
--- branches/blender2.5/blender/extern/glew/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/extern/glew/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -9,4 +9,4 @@
defs = ''
incs = 'include'
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern', 'player'], priority=[50, 50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern'], priority=[50])
Modified: branches/blender2.5/blender/extern/libopenjpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/libopenjpeg/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/extern/libopenjpeg/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -20,5 +20,5 @@
oj_env.BlenderLib ( libname='extern_openjpeg',
sources=sources, includes=Split(incs),
defines=[],
- libtype=['core','intern','player'],
- priority=[10, 10, 300], compileflags = flags)
+ libtype=['extern'],
+ priority=[10], compileflags = flags)
Modified: branches/blender2.5/blender/intern/iksolver/SConscript
===================================================================
--- branches/blender2.5/blender/intern/iksolver/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/intern/iksolver/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -5,5 +5,5 @@
incs = 'intern ../moto/include ../memutil'
-env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
+env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern'], priority=[100] )
Modified: branches/blender2.5/blender/intern/moto/SConscript
===================================================================
--- branches/blender2.5/blender/intern/moto/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/intern/moto/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -5,4 +5,4 @@
incs = 'include'
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern', 'player'], priority = [15, 130] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern'], priority = [130] )
Modified: branches/blender2.5/blender/source/blender/editors/animation/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/source/blender/editors/animation/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -6,4 +6,4 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )
+env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] )
Modified: branches/blender2.5/blender/source/blender/editors/datafiles/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/datafiles/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/source/blender/editors/datafiles/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -6,4 +6,4 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' #/intern/guardedalloc'
-env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core','intern'], priority=[50, 55] )
+env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core'], priority=[250] )
Modified: branches/blender2.5/blender/source/blender/editors/interface/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/source/blender/editors/interface/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -14,4 +14,4 @@
defs.append('INTERNATIONAL')
defs.append('FTGL_STATIC_LIBRARY')
-env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[45, 50] )
+env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[60] )
Modified: branches/blender2.5/blender/source/blender/editors/screen/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/SConscript 2008-12-23 19:47:33 UTC (rev 18031)
+++ branches/blender2.5/blender/source/blender/editors/screen/SConscript 2008-12-23 20:13:31 UTC (rev 18032)
@@ -12,4 +12,4 @@
if not env['WITH_BF_PYTHON']:
defs += 'DISABLE_PYTHON'
-env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[50] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[55] )
Modified: branches/blender2.5/blender/source/blender/editors/space_action/SConscript
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list