diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
| commit | 8f788c64db587e74079d812dbcea40c2bd4b91ff (patch) | |
| tree | c767e8318a9e7aded16be6cab2042f3ea11e7912 /source/blender/editors/mesh/SConscript | |
| parent | 36bb566d4e6e06e08d782d610d60d755cbda2396 (diff) | |
merge with trunk/2.5 at r23876
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/editors/mesh/SConscript')
| -rw-r--r-- | source/blender/editors/mesh/SConscript | 7 |
1 files changed, 7 insertions, 0 deletions
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] ) |