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/nodes/SConscript | |
| parent | c344021b838a6fb2cbcc68b296144a734f74260f (diff) | |
* tweak linking priorities - should help for GCC users
* some lib renaming
Diffstat (limited to 'source/blender/nodes/SConscript')
| -rw-r--r-- | source/blender/nodes/SConscript | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 0020094c6ea..746be45eb91 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -21,26 +21,26 @@ incs += ' ' + env['BF_SDL_INC'] defs = '' if env['WITH_BF_INTERNATIONAL']: - defs += 'WITH_FREETYPE2' + defs += 'WITH_FREETYPE2' if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' - incs += ' ' + env['BF_VERSE_INCLUDE'] + defs += ' WITH_VERSE' + incs += ' ' + env['BF_VERSE_INCLUDE'] if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' + defs += ' WITH_VERSE' if env['WITH_BF_OPENEXR'] == 1: - defs += ' WITH_OPENEXR' + defs += ' WITH_OPENEXR' if env['WITH_BF_FFMPEG'] == 1: - defs += ' WITH_FFMPEG' - incs += ' ' + env['BF_FFMPEG_INC'] + defs += ' WITH_FFMPEG' + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME'] == 1: - defs += ' WITH_QUICKTIME' - incs += ' ' + env['BF_QUICKTIME_INC'] + defs += ' WITH_QUICKTIME' + incs += ' ' + env['BF_QUICKTIME_INC'] defs += ' WITH_CCGSUBSURF' -env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) +env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [80, 15] ) |