diff options
Diffstat (limited to 'source/blender/nodes/SConscript')
| -rw-r--r-- | source/blender/nodes/SConscript | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index becf6e79d44..ad500725812 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -39,21 +39,22 @@ incs = [ './shader', './texture', '#/intern/guardedalloc', - '#/extern/glew/include', - '../blenfont', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '../blenkernel', '../blenlib', + '../blentranslation', '../gpu', '../imbuf', '../makesdna', '../makesrna', '../render/extern/include', - env['BF_OPENGL_INC'], env['BF_ZLIB_INC'], ] incs = ' '.join(incs) -defs = [] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] @@ -75,6 +76,9 @@ if env['WITH_BF_COMPOSITOR']: if env['WITH_BF_FREESTYLE']: defs.append('WITH_FREESTYLE') +if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_DEBUG']: + defs.append('WITH_CYCLES_DEBUG') + 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] ) env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) |