From 8f788c64db587e74079d812dbcea40c2bd4b91ff Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Thu, 22 Oct 2009 23:22:05 +0000 Subject: merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]] --- source/blender/editors/space_node/SConscript | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/editors/space_node/SConscript') diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 5453aa7dd44..5493e2d739f 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -15,4 +15,11 @@ if env['CC'] == 'gcc': #cf.append('-Werror') pass +if env['OURPLATFORM'] == 'linux2': + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf ) -- cgit v1.2.3