diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-04-15 02:19:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-04-15 02:19:29 +0400 |
| commit | f725a3d6c45efa281a3586206ca7ee153eaaf851 (patch) | |
| tree | a1a22d5060bae91affc6afcd7bfac2b67df599f5 /source/blender/makesrna | |
| parent | 48ed63b1a5cb7808df66aaeb16d7ea8cf36a7e34 (diff) | |
Scons ToDo:
* Made Frameserver building optional, added WITH_BF_FRAMESERVER.
* Enabled per default in btools.py
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index ce87e0ef482..d4ee86b281c 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -35,6 +35,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'] diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 60818680d0c..c8d7e0ae421 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -54,7 +54,8 @@ if env['WITH_BF_CINEON']: if env['WITH_BF_HDR']: defs.append('WITH_HDR') -defs.append('WITH_FRAMESERVER') # TODO, make optional +if env['WITH_BF_FRAMESERVER']: + defs.append('WITH_FRAMESERVER') if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') |