[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18033] branches/blender2.5/blender/source /blender: 2.5 / SCons

Nathan Letwory jesterking at letwory.net
Tue Dec 23 22:20:38 CET 2008


Revision: 18033
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18033
Author:   jesterking
Date:     2008-12-23 22:20:34 +0100 (Tue, 23 Dec 2008)

Log Message:
-----------
2.5 / SCons

New priorities for most libs, at least core. This is still for Blender proper, BGE and such still to come.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/avi/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/blenpluginapi/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/object/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_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/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/radiosity/SConscript
    branches/blender2.5/blender/source/blender/render/SConscript
    branches/blender2.5/blender/source/blender/yafray/SConscript

Modified: branches/blender2.5/blender/source/blender/avi/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/avi/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/avi/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -7,4 +7,4 @@
 incs = '. #/intern/guardedalloc'
 incs += ' ' + env['BF_JPEG_INC']
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [185] )

Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -59,4 +59,4 @@
 if env['WITH_BF_PLAYER']:
     SConscript(['bad_level_call_stubs/SConscript'])
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [155] )

Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -26,4 +26,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core', 'intern', 'player'], priority = [85,150,195], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )

Modified: branches/blender2.5/blender/source/blender/blenloader/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/blenloader/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -14,4 +14,4 @@
 	defs += ' WITH_VERSE'
 	incs += ' ' + env['BF_VERSE_INCLUDE']
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [70, 30] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [165, 30] )

Modified: branches/blender2.5/blender/source/blender/blenpluginapi/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenpluginapi/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/blenpluginapi/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -11,4 +11,4 @@
 	defs.append('WITH_QUICKTIME')
 	incs += ' ' + env['BF_QUICKTIME_INC']
 
-env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [75, 35] )
+env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [170, 35] )

Modified: branches/blender2.5/blender/source/blender/editors/datafiles/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/datafiles/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/datafiles/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -6,4 +6,4 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core'], priority=[250] )
+env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core'], priority=[135] )

Modified: branches/blender2.5/blender/source/blender/editors/interface/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/interface/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -14,4 +14,4 @@
     defs.append('INTERNATIONAL')
     defs.append('FTGL_STATIC_LIBRARY')
 
-env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[60] )
+env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[110] )

Modified: branches/blender2.5/blender/source/blender/editors/object/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/object/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -8,4 +8,4 @@
 incs += ' #/intern/guardedalloc #intern/bmfont'
 incs += ' ../../makesrna'
 
-env.BlenderLib ( 'bf_editors_object', sources, Split(incs), [], libtype=['core','intern'], priority=[33, 38] )
+env.BlenderLib ( 'bf_editors_object', sources, Split(incs), [], libtype=['core'], priority=[35] )

Modified: branches/blender2.5/blender/source/blender/editors/screen/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -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=[55] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] )

Modified: branches/blender2.5/blender/source/blender/editors/space_action/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/space_action/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -6,4 +6,4 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[33] )
+env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[80] )

Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -6,4 +6,4 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), [], libtype=['core'], priority=[70] )
+env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), [], libtype=['core'], priority=[120] )

Modified: branches/blender2.5/blender/source/blender/editors/space_file/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/space_file/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -7,4 +7,4 @@
 incs += ' ../../blenloader'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), [], libtype=['core'], priority=[65] )
+env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), [], libtype=['core'], priority=[115] )

Modified: branches/blender2.5/blender/source/blender/editors/space_image/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/space_image/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -6,4 +6,4 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core'], priority=[35] )
+env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core'], priority=[45] )

Modified: branches/blender2.5/blender/source/blender/editors/space_info/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_info/SConscript	2008-12-23 20:13:31 UTC (rev 18032)
+++ branches/blender2.5/blender/source/blender/editors/space_info/SConscript	2008-12-23 21:20:34 UTC (rev 18033)
@@ -6,4 +6,4 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), [], libtype=['core'], priority=[40] )
+env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), [], libtype=['core'], priority=[70] )

Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript	2008-12-23 20:13:31 UTC (rev 18032)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list