[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13172] branches/blender2.5/blender: * fix linking order for l00nix

[Nathan Letwory]

Revision: 13172
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13172
Author:   jesterking
Date:     2008-01-08 18:32:38 +0100 (Tue, 08 Jan 2008)

Log Message:
-----------
* fix linking order for l00nix

Modified Paths:
--------------
    branches/blender2.5/blender/intern/SoundSystem/SConscript
    branches/blender2.5/blender/intern/ghost/SConscript
    branches/blender2.5/blender/intern/string/SConscript
    branches/blender2.5/blender/source/blender/editors/screen/SConscript
    branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript

Modified: branches/blender2.5/blender/intern/SoundSystem/SConscript
===================================================================
--- branches/blender2.5/blender/intern/SoundSystem/SConscript	2008-01-08 16:56:00 UTC (rev 13171)
+++ branches/blender2.5/blender/intern/SoundSystem/SConscript	2008-01-08 17:32:38 UTC (rev 13172)
@@ -13,4 +13,4 @@
 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] )

Modified: branches/blender2.5/blender/intern/ghost/SConscript
===================================================================
--- branches/blender2.5/blender/intern/ghost/SConscript	2008-01-08 16:56:00 UTC (rev 13171)
+++ branches/blender2.5/blender/intern/ghost/SConscript	2008-01-08 17:32:38 UTC (rev 13172)
@@ -27,6 +27,8 @@
 	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] ) 

Modified: branches/blender2.5/blender/intern/string/SConscript
===================================================================
--- branches/blender2.5/blender/intern/string/SConscript	2008-01-08 16:56:00 UTC (rev 13171)
+++ branches/blender2.5/blender/intern/string/SConscript	2008-01-08 17:32:38 UTC (rev 13172)
@@ -4,4 +4,4 @@
 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] )

Modified: branches/blender2.5/blender/source/blender/editors/screen/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-01-08 16:56:00 UTC (rev 13171)
+++ branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-01-08 17:32:38 UTC (rev 13172)
@@ -7,4 +7,4 @@
 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] )

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript	2008-01-08 16:56:00 UTC (rev 13171)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript	2008-01-08 17:32:38 UTC (rev 13172)
@@ -6,4 +6,4 @@
 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] )