diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
| commit | cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9 (patch) | |
| tree | 503d6bc4376b27a6efe73739609e9bbb1f1188cb /source/blender/python/SConscript | |
| parent | 0896a227232f741b6028219a208ae60e78515406 (diff) | |
| parent | b5595298d36a5023cc33ed41463fd6c032f2ec7b (diff) | |
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index d42ad630e75..c98f347d5af 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -47,5 +47,9 @@ if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_CYCLES']: defs.append('WITH_CYCLES') +if env['WITH_BF_FFMPEG']: + defs.append('WITH_FFMPEG') + incs += ' ' + env['BF_FFMPEG_INC'] + sources = env.Glob('intern/*.c') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) |