* tweak linking priorities - should help for GCC users

* some lib renaming

extern/bullet2/src/SConscript

@@ -92,6 +92,6 @@ collision_src = ["BulletCollision/BroadphaseCollision/btAxisSweep3.cpp",
 
 incs = '. BulletCollision BulletDynamics LinearMath'
 
-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_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 165], 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_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 160], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision', sources=collision_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision', sources=collision_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[30, 170], compileflags=cflags )

extern/qhull/SConscript

@@ -32,4 +32,4 @@ sources = ['src/geom.c',
 
 incs = 'include src'
 
-env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype=['game2','player'], priority=[50, 85], compileflags = cflags)
+env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype=['game2','player'], priority=[55, 70], compileflags = cflags)

extern/solid/SConscript

@@ -31,4 +31,4 @@ sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/c
 
 incs = 'include src src/broad src/complex src/convex ../qhull/include'
 
-env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[50, 65] , compileflags = cflags)

intern/SoundSystem/SConscript

@@ -13,4 +13,4 @@ if env['WITH_BF_OPENAL']:
 else:
 	defs = 'NO_SOUND'
 
-env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] )
+env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [30,135] )

intern/boolop/SConscript

@@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc'
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+	env.BlenderLib ('bf_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
 else:
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
+	env.BlenderLib ('bf_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 

intern/bsp/SConscript

@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.cpp')
 incs = 'intern ../container ../moto/include ../memutil'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
+	env.BlenderLib ('bf_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
 else:
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 )
+	env.BlenderLib ('bf_BSP', sources, Split(incs), [], libtype='core', priority=20 )
 

intern/container/SConscript

@@ -4,4 +4,4 @@ Import ('env')
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('blender_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 )
+env.BlenderLib ('bf_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 )

intern/decimation/SConscript

@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ../moto/include ../container ../memutil'
 
-env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 25] )
+env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 20] )

intern/ghost/SConscript

@@ -29,4 +29,4 @@ else:
 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','player'], priority = [25,15] ) 
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [40,5] ) 

intern/guardedalloc/SConscript

@@ -5,4 +5,4 @@ Import('env')
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [10, 175] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] )

intern/iksolver/SConscript

@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'intern ../moto/include ../memutil'
 
-env.BlenderLib ('blender_IK', sources, Split(incs), [], libtype='blender', priority=10 )
+env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype='blender', priority=10 )

intern/moto/SConscript

@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'include'
 
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 60, 130] )

intern/opennl/SConscript

@@ -8,5 +8,5 @@ incs = 'extern superlu'
 if (env['OURPLATFORM'] == 'win32-mingw'):
 	env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
 else:
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 )
+	env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=65 )
 

intern/string/SConscript

@@ -4,4 +4,4 @@ Import ('env')
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [30,10] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [50,0] )

source/blender/avi/SConscript

@@ -7,4 +7,4 @@ sources = env.Glob('intern/*.c')
 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','player'], priority = [105, 40] )

source/blender/blenkernel/SConscript

@@ -44,4 +44,4 @@ defs += ' WITH_CCGSUBSURF'
 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','player'], priority = [75, 10] )

source/blender/blenlib/SConscript

@@ -23,4 +23,4 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 	incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [100,195], compileflags =cflags )

source/blender/blenloader/SConscript

@@ -15,4 +15,4 @@ if env['WITH_BF_VERSE']:
 	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 = [85, 25] )

source/blender/blenpluginapi/SConscript

@@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME'] == 1:
 	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 = [90, 30] )

source/blender/editors/interface/SConscript

@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' #/intern/guardedalloc'
+
+env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), [], libtype=['core','intern'], priority=[15, 30] )

source/blender/editors/screen/SConscript

@@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../blenloader ../../windowmanager ../../python'
 incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )

source/blender/editors/space_view3d/SConscript

@@ -6,4 +6,4 @@ sources = env.Glob('*.c')
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[25, 35] )

source/blender/imbuf/SConscript

@@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [95, 35] )

source/blender/imbuf/intern/cineon/SConscript

@@ -14,4 +14,4 @@ incs = ['.',
 
 defs = []
 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [120, 75])

source/blender/imbuf/intern/dds/SConscript

@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [110, 105])

source/blender/imbuf/intern/openexr/SConscript

@@ -15,4 +15,4 @@ incs += Split(env['BF_OPENEXR_INC'])
 
 defs = []
 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [125, 85])

source/blender/nodes/SConscript

@@ -43,4 +43,4 @@ if env['WITH_BF_QUICKTIME'] == 1:
 
 defs += ' WITH_CCGSUBSURF'
 
-env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
+env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [80, 15] )

source/blender/python/SConscript

@@ -13,4 +13,4 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']:
 	defs.append('Py_TRACE_REFS')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [60])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [70])

source/blender/quicktime/SConscript

@@ -21,9 +21,9 @@ incs.append(env['BF_QUICKTIME_INC'])
 
 if env['OURPLATFORM'] in ['win32-vc', 'darwin']:
 	types = ['core', 'player']
-    priorities = [95, 200]
+	priorities = [115, 200]
 else:
 	types = ['core']
-    priorities = [95]
+	priorities = [115]
 
 env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype=types, priority=priorities)

source/blender/radiosity/SConscript

@@ -9,4 +9,4 @@ incs += ' ../render/intern/include'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'blender_radiosity', sources, Split(incs), [], libtype='core', priority=50 )
+env.BlenderLib ( 'bf_radiosity', sources, Split(incs), [], libtype='core', priority=60 )

source/blender/render/SConscript

@@ -28,4 +28,4 @@ if env['WITH_BF_OPENEXR']:
 if env['OURPLATFORM']=='linux2':
 	cflags='-pthread'
 
-env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
+env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=55, compileflags=cflags )

source/blender/windowmanager/SConscript

@@ -12,4 +12,4 @@ incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system'
 
 incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont'
 incs += ' #/intern/elbeem'
-env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[45, 45] )

source/creator/SConscript

@@ -15,4 +15,4 @@ if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 )
+env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 )

source/gameengine/BlenderRoutines/SConscript

@@ -26,4 +26,4 @@ cxxflags = []
 if env['OURPLATFORM']=='win32-vc':
 	cxxflags.append ('/GR')
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 45] , compileflags=cxxflags)

source/gameengine/Converter/SConscript

@@ -23,4 +23,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,50] )

source/gameengine/Expressions/SConscript

@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125] )
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,120] )

source/gameengine/GameLogic/SConscript

@@ -9,4 +9,4 @@ incs += ' #/source/gameengine/Expressions #/intern/moto/include'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SDL_INC']
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] )
+env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 100] )

source/gameengine/GamePlayer/ghost/SConscript

@@ -46,4 +46,4 @@ cflags = []
 if env['OURPLATFORM']=='win32-vc':
 	cflags = ['/GR']
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=5, compileflags=cflags)

source/gameengine/Ketsji/KXNetwork/SConscript

@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155] )
+env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 145] )

source/gameengine/Ketsji/SConscript

@@ -31,4 +31,4 @@ incs += ' ' + env['BF_SDL_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 60], compileflags = cflags )

source/gameengine/Network/LoopBackNetwork/SConscript

@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[25, 165] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[35, 155] )

source/gameengine/Network/SConscript

@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2', 'player'], priority=[15, 160] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2', 'player'], priority=[15, 150] )

source/gameengine/Physics/Bullet/SConscript

@@ -12,4 +12,4 @@ if env['OURPLATFORM']=='win32-vc':
 	cflags.append('/GR')
 	cflags.append('/O2')
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,90] )
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,80] )

source/gameengine/Physics/Dummy/SConscript

@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['game','player'], priority=[10,100] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['game','player'], priority=[10,95] )

source/gameengine/Physics/Sumo/SConscript

@@ -23,4 +23,4 @@ if env['OURPLATFORM']=='win32-vc':
 	cflags.append('/GR')
 	cflags.append('/O1')
 
-env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['game2','player'], priority=[30, 70] , compileflags=cflags)
+env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['game2','player'], priority=[40, 55] , compileflags=cflags)

source/gameengine/Physics/common/SConscript

@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IPhysicsController.cpp PHY_IPhysicsEnvironme
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95] )
+env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 45, 90] )

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript

@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp') #'RAS_GLExtensionManager.cpp RAS_ListRasterizer.cpp
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer'
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 115] )

source/gameengine/Rasterizer/SConscript

@@ -8,6 +8,6 @@ incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 if env['OURPLATFORM']=='win32-vc':
 	cflags = []
 	cflags.append('/Ox')
-	env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
+	env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,110], compileflags = cflags )
 else:
-	env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115] )
+	env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,110] )

source/gameengine/SceneGraph/SConscript

@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp') #'SG_BBox.cpp SG_Controller.cpp SG_IObject.cpp SG_No
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['game','player'], priority=[50,130] )
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['game','player'], priority=[50,125] )

source/kernel/SConscript

@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include'
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 140] )