diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
| commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
| tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/blender/render/SConscript | |
| parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) | |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index b5cab267955..db151775b96 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -4,21 +4,15 @@ Import ('env') cflags='' sources = env.Glob('intern/source/*.c') -incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna' +incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader' -incs += ' ../freestyle' +incs += ' ../include ../blenloader ../../../intern/smoke/extern' defs = [] -if env['WITH_BF_YAFRAY']: - incs += ' ../yafray' -else: - defs.append('DISABLE_YAFRAY') - if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') @@ -29,4 +23,4 @@ if env['WITH_BF_OPENEXR']: if env['OURPLATFORM']=='linux2': 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=145, compileflags=cflags ) |