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/mesh/SConscript | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/editors/mesh/SConscript') diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index 80536b5e431..ac46ee157cc 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -9,4 +9,11 @@ incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' incs += ' ../../bmesh ' +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_mesh', sources, Split(incs), [], libtype=['core'], priority=[45] ) -- cgit v1.2.3