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/render/SConscript | |
| parent | c344021b838a6fb2cbcc68b296144a734f74260f (diff) | |
* tweak linking priorities - should help for GCC users
* some lib renaming
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index e1e43eb7830..d06331a5b48 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -11,21 +11,21 @@ incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging' defs = [] if env['WITH_BF_YAFRAY'] == 1: - incs += ' ../yafray' + incs += ' ../yafray' else: - defs.append('DISABLE_YAFRAY') + defs.append('DISABLE_YAFRAY') if env['WITH_BF_QUICKTIME'] == 1: - defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + defs.append('WITH_QUICKTIME') + incs += ' ' + env['BF_QUICKTIME_INC'] if env['WITH_BF_FFMPEG'] == 1: - defs.append('WITH_FFMPEG') + defs.append('WITH_FFMPEG') if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') if env['OURPLATFORM']=='linux2': - cflags='-pthread' + cflags='-pthread' -env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags ) +env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=55, compileflags=cflags ) |