* tweak linking priorities - should help for GCC users

* some lib renaming

13 files changed, 45 insertions, 45 deletions

diff --git a/intern/SConscript b/intern/SConscript
index f6092b7bd02..2d68969c783 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -2,17 +2,17 @@
 Import ('env')
 
 SConscript(['SoundSystem/SConscript',
-            'string/SConscript',
-            'ghost/SConscript',
-            'guardedalloc/SConscript',
-            'bmfont/SConscript',
-            'moto/SConscript',
-            'container/SConscript',
-            'memutil/SConscript/',
-            'decimation/SConscript',
-            'iksolver/SConscript',
-            'boolop/SConscript',
-            'opennl/SConscript'])
+			'string/SConscript',
+			'ghost/SConscript',
+			'guardedalloc/SConscript',
+			'bmfont/SConscript',
+			'moto/SConscript',
+			'container/SConscript',
+			'memutil/SConscript/',
+			'decimation/SConscript',
+			'iksolver/SConscript',
+			'boolop/SConscript',
+			'opennl/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult
@@ -21,9 +21,9 @@ SConscript(['SoundSystem/SConscript',
 NEW_CSG='false'
 
 if env['BF_NO_ELBEEM'] == 0:
-    SConscript(['elbeem/SConscript'])
+	SConscript(['elbeem/SConscript'])
 
 if NEW_CSG=='false':
-    SConscript(['bsp/SConscript'])
+	SConscript(['bsp/SConscript'])
 else:
-    SConscript(['csg/SConscript'])
+	SConscript(['csg/SConscript'])
diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index a9c1110c09a..97a34326008 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -7,10 +7,10 @@ sources = env.Glob('dummy/*.cpp') + env.Glob('intern/*.cpp')
 incs = '. intern ../moto/include ../string dummy openal sdl'
 defs = ''
 if env['WITH_BF_OPENAL']:
-    sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
-    incs += ' ' + env['BF_OPENAL_INC']
-    incs += ' ' + env['BF_SDL_INC']
+	sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
+	incs += ' ' + env['BF_OPENAL_INC']
+	incs += ' ' + env['BF_SDL_INC']
 else:
-    defs = 'NO_SOUND'
+	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] )
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
index a3f3c0b6433..6bd0842f3e5 100644
--- a/intern/boolop/SConscript
+++ b/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 )
 
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript
index e363fd1d4c3..10dc29e675a 100644
--- a/intern/bsp/SConscript
+++ b/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 )
 
diff --git a/intern/container/SConscript b/intern/container/SConscript
index d05104da562..18f078b57f6 100644
--- a/intern/container/SConscript
+++ b/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 )
diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript
index cf199fb3bc5..2dd2ac38498 100644
--- a/intern/decimation/SConscript
+++ b/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] )
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index bb6637ba32d..0c0365d0311 100644
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -7,7 +7,7 @@ sources = env.Glob('intern/*.cpp')
 
 defs = 'NOGUI ELBEEM_BLENDER=1'
 if env['OURPLATFORM']=='win32-vc':
-    defs += ' USE_MSVC6FIXES'
+	defs += ' USE_MSVC6FIXES'
 incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] + ' ' +env['BF_SDL_INC']
 
 env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 40968e816a9..7e00a75c876 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -11,22 +11,22 @@ sources = env.Glob('intern/*.cpp')
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
 
 if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'):
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+	for f in pf:
+		sources.remove('intern' + os.sep + f + 'Win32.cpp')
+		sources.remove('intern' + os.sep + f + 'Carbon.cpp')
 elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'X11.cpp')
-        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+	for f in pf:
+		sources.remove('intern' + os.sep + f + 'X11.cpp')
+		sources.remove('intern' + os.sep + f + 'Carbon.cpp')
 elif window_system == 'darwin':
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        sources.remove('intern' + os.sep + f + 'X11.cpp')
+	for f in pf:
+		sources.remove('intern' + os.sep + f + 'Win32.cpp')
+		sources.remove('intern' + os.sep + f + 'X11.cpp')
 else:
-    print "Unknown window system specified."
-    Exit()
+	print "Unknown window system specified."
+	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 = [25,15] ) 
+	incs = env['BF_WINTAB_INC'] + ' ' + incs
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [40,5] ) 
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
index ef6c6b49266..0184ddd9785 100644
--- a/intern/guardedalloc/SConscript
+++ b/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] )
diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript
index 81bf61dfcd8..ce4a05341d3 100644
--- a/intern/iksolver/SConscript
+++ b/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 )
diff --git a/intern/moto/SConscript b/intern/moto/SConscript
index 636515aa5c5..4152633e393 100644
--- a/intern/moto/SConscript
+++ b/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] )
diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript
index bcfb030f7e6..56ad5a57ecf 100644
--- a/intern/opennl/SConscript
+++ b/intern/opennl/SConscript
@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
 incs = 'extern superlu'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
+	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 )
 
diff --git a/intern/string/SConscript b/intern/string/SConscript
index 7f817f82759..06d74afd647 100644
--- 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 = [30,10] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [50,0] )