* fix linking order for l00nix

diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index 97a343260083e468294529da31eb3299b73edefb..54fc13293ebce3bcccd4013cf6f7ab14e4161707 100644 (file)
--- a/intern/SoundSystem/SConscript
+++ b/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 = [30,135] )
+env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] )

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 7e00a75c87623d624b35ac8256fc59dbd2ac347a..bca9d71532452e8355fac0e24497a6d53464cdb1 100644 (file)
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -27,6 +27,8 @@ else:
        Exit()
 
 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 = [40,5] ) 
+
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] ) 

diff --git a/intern/string/SConscript b/intern/string/SConscript
index 06d74afd6477826e3ecaa6150e7e75975f88a818..292ddf5aa63c1c9abc345a122a5562e6e693cf9c 100644 (file)
--- a/intern/string/SConscript
+++ b/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 = [50,0] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'common','player'], priority = [50,19,0] )

diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index 786caa1a14381def4ace041118c172d4b6d0893f..8ca512fedc1758c196796c4ce53949db17a9b142 100644 (file)
--- a/source/blender/editors/screen/SConscript
+++ b/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_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[30, 35] )

diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index 14586dec7fe88d1b1e700fd7cb2ce74fef78137e..6e6c9fdc29d73f2ebdfd907c3a8986812de4801a 100644 (file)
--- a/source/blender/editors/space_view3d/SConscript
+++ b/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_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[25, 35] )
+env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )