diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
| commit | 63a88075b574e8f2f9adc041f423f49a7356d736 (patch) | |
| tree | 951f1f65d74d052debdafa14f6ad22750b6aad04 /source/blender/render/SConscript | |
| parent | 11bdf6ea10ee7bc5e2862cdddbf42eddb06c42fa (diff) | |
| parent | 69a24325742c617a9902376b061006dfb24f0a3c (diff) | |
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2009-jaguarandi
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 4ad7694cbbf..88942ced027 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -16,14 +16,19 @@ if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] -if env['WITH_BF_FFMPEG']: - defs.append('WITH_FFMPEG') - if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') if env['OURPLATFORM']=='linux2': cflags += ['-pthread'] + +if env['OURPLATFORM'] == 'linux2': + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags ) env.BlenderLib ( libname = 'bf_render_raytrace', sources = raysources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags, cxx_compileflags=cxxflags ) |