* tweak linking priorities - should help for GCC users

* some lib renaming

4 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index f9e46b20d9a..9d8bcf56ec7 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -18,17 +18,17 @@ if env['WITH_BF_VERSE']:
 	incs += ' ' + env['BF_VERSE_INCLUDE']
 	
 if env['WITH_BF_OPENEXR'] == 1:
-    defs.append('WITH_OPENEXR')
+	defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_DDS'] == 1:
-    defs.append('WITH_DDS')
+	defs.append('WITH_DDS')
 
 if env['WITH_BF_FFMPEG'] == 1:
-    defs.append('WITH_FFMPEG')
-    incs += ' ' + env['BF_FFMPEG_INC']
+	defs.append('WITH_FFMPEG')
+	incs += ' ' + env['BF_FFMPEG_INC']
 
 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] )
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index 7bfaa8dbdf2..9d3bbcbc058 100644
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -4,14 +4,14 @@ Import ('env')
 source_files = env.Glob('*.c')
 
 incs = ['.',
-    '../../../blenkernel',
-    '../../',
-    '..',
-    '../../../blenlib',
-    'intern/include',
-    '#/intern/guardedalloc',
-    '../../../makesdna']
+	'../../../blenkernel',
+	'../../',
+	'..',
+	'../../../blenlib',
+	'intern/include',
+	'#/intern/guardedalloc',
+	'../../../makesdna']
 
 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])
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index d005bae02be..f56c238fd2a 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/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])
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index 1b0a0ed6110..2ce3d18feb5 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -14,5 +14,5 @@ incs = ['.',
 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])