From f725a3d6c45efa281a3586206ca7ee153eaaf851 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 14 Apr 2012 22:19:29 +0000 Subject: Scons ToDo: * Made Frameserver building optional, added WITH_BF_FRAMESERVER. * Enabled per default in btools.py --- source/blender/blenkernel/SConscript | 3 ++- source/blender/makesrna/SConscript | 3 +++ source/blender/makesrna/intern/SConscript | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender') 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') -- cgit v1.2.3