diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/SConscript | 6 | ||||
| -rw-r--r-- | source/blender/nodes/SConscript | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index c2ca6eb5ae5..e1f81f9aaba 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -8,11 +8,9 @@ SConscript(['avi/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', 'gpu/SConscript', - 'opencl/SConscript', 'editors/SConscript', 'imbuf/SConscript', 'makesdna/SConscript', - 'compositor/SConscript', 'render/SConscript', 'nodes/SConscript', 'modifiers/SConscript', @@ -39,3 +37,7 @@ if env['WITH_BF_QUICKTIME']: if env['WITH_BF_COLLADA']: SConscript (['collada/SConscript']) + +if env['WITH_BF_COMPOSITOR']: + SConscript (['compositor/SConscript', + 'opencl/SConscript']) diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index d9fabc10a63..bf70b5a6ed5 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -13,7 +13,6 @@ incs += ' ../imbuf ../avi ' incs += ' ../blenloader' incs += ' ../blenfont ../blenkernel ../renderconverter ' incs += ' ../gpu #/extern/glew/include ' -incs += ' ../compositor ' incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_ZLIB_INC'] @@ -36,8 +35,10 @@ if env['OURPLATFORM'] == 'linux': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] - -defs.append("WITH_COMPOSITOR") + +if env['WITH_BF_COMPOSITOR']: + incs += ' ../compositor ' + defs.append("WITH_COMPOSITOR") 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] ) |