diff options
Diffstat (limited to 'source/blender/nodes/SConscript')
| -rw-r--r-- | source/blender/nodes/SConscript | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 91ca6cd8c81..4859bbb550f 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -2,12 +2,12 @@ Import ('env') sources = env.Glob('intern/*.c') -sources += env.Glob('intern/CMP_nodes/*.c') -sources += env.Glob('intern/SHD_nodes/*.c') -sources += env.Glob('intern/TEX_nodes/*.c') +cmpsources = env.Glob('intern/CMP_nodes/*.c') +shdsources = env.Glob('intern/SHD_nodes/*.c') +texsources = env.Glob('intern/TEX_nodes/*.c') incs = '. ./intern ' -incs += '#/intern/guardedalloc ../include ../blenlib ../makesdna' +incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna' incs += ' ../render/extern/include ' incs += ' ../imbuf ../avi ' incs += ' ../blenloader' @@ -28,13 +28,6 @@ else: if env['WITH_BF_INTERNATIONAL']: defs += ' WITH_FREETYPE2' -if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' - incs += ' ' + env['BF_VERSE_INCLUDE'] - -if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' - if env['WITH_BF_OPENEXR']: defs += ' WITH_OPENEXR' @@ -46,6 +39,7 @@ if env['WITH_BF_QUICKTIME']: defs += ' WITH_QUICKTIME' incs += ' ' + env['BF_QUICKTIME_INC'] -defs += ' WITH_CCGSUBSURF ' - -env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) +env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [190] ) +env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] ) +env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] ) +env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] ) |