diff options
| -rw-r--r-- | build_files/scons/tools/btools.py | 5 | ||||
| -rw-r--r-- | source/blender/nodes/SConscript | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 8f5bb1ffc57..2fa503f3f26 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -108,7 +108,7 @@ def validate_arguments(args, bc): 'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_FRAMESERVER', - 'WITH_BF_COMPOSITOR', + 'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY', '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', @@ -583,7 +583,8 @@ def read_opts(env, cfg, args): ('BF_BOOST_LIBPATH', 'Boost library path', ''), ('BF_BOOST_LIB_STATIC', 'Boost static library', ''), - (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)) + (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)), + (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True)) ) # end of opts.AddOptions() return localopts diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index f42dfdd2e1e..ec4f00a199a 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -40,8 +40,8 @@ if env['WITH_BF_COMPOSITOR']: incs += ' ../compositor ' defs.append("WITH_COMPOSITOR") -# TODO, make optional -defs.append("WITH_COMPOSITOR_LEGACY") +if env['WITH_BF_COMPOSITOR_LEGACY']: + defs.append("WITH_COMPOSITOR_LEGACY") env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] ) env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) |