diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/editors/space_node/SConscript | |
parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/editors/space_node/SConscript')
-rw-r--r-- | source/blender/editors/space_node/SConscript | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 5493e2d739f..6a5556e3e51 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -3,23 +3,23 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' -incs += ' ../../nodes ../../render/extern/include' +incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' +incs += ' ../../nodes ../../render/extern/include ../../blenloader' incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' defs = [] cf = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): - #cf.append('/WX') - pass + #cf.append('/WX') + pass if env['CC'] == 'gcc': - #cf.append('-Werror') - pass + #cf.append('-Werror') + pass if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf ) |