diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
| commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
| tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/makesrna/SConscript | |
| parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
| parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) | |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index f1817bfbe6f..20862aa626d 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -36,6 +36,9 @@ if env['WITH_BF_CINEON']: if env['WITH_BF_HDR']: defs.append('WITH_HDR') +if env['WITH_BF_FRAMESERVER']: + defs.append('WITH_FRAMESERVER') + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] |