diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
| commit | 15da2232f7aa0f11a89e48f41f5730ddc8bb1b10 (patch) | |
| tree | c6ed3ab740269771e8ffa8f04fd57f1c9a345455 /source/blender/imbuf/intern | |
| parent | c344021b838a6fb2cbcc68b296144a734f74260f (diff) | |
* tweak linking priorities - should help for GCC users
* some lib renaming
Diffstat (limited to 'source/blender/imbuf/intern')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/SConscript | 18 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/dds/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/SConscript | 4 |
3 files changed, 12 insertions, 12 deletions
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]) |