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 | |
| parent | 48ed63b1a5cb7808df66aaeb16d7ea8cf36a7e34 (diff) | |
Scons ToDo:
* Made Frameserver building optional, added WITH_BF_FRAMESERVER.
* Enabled per default in btools.py
| -rw-r--r-- | build_files/scons/tools/btools.py | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index f822453367f..544f7f066ce 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -107,6 +107,7 @@ def validate_arguments(args, bc): 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'BF_FFMPEG_DLL', 'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', + 'WITH_BF_FRAMESERVER', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH', 'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH', @@ -313,6 +314,8 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)), (BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)), + + (BoolVariable('WITH_BF_FRAMESERVER', 'Support export to a frameserver', True)), (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)), ('BF_FFMPEG', 'FFMPEG base path', ''), diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index fe27e78abc0..00c2cf1696e 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -26,7 +26,8 @@ defs = [ 'GLEW_STATIC' ] if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') -defs.append('WITH_FRAMESERVER') # TODO, make optional +if env['WITH_BF_FRAMESERVER']: + defs.append('WITH_FRAMESERVER') if env['WITH_BF_PYTHON']: incs += ' ../python' 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') |