diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
| commit | 4a157de23d43c22abec8bd6922f0355334e413f8 (patch) | |
| tree | c8ca75fef261ce1316ea9042aa4bd689aa4eb584 /source/blender/editors/mesh/SConscript | |
| parent | dbdb58f2a3c0d086afabdacab40c4d83c79e1a04 (diff) | |
| parent | bc593cac2354c863f074d9d51cffb3dca9f499a3 (diff) | |
svn merge ^/trunk/blender -r40587:40643
Diffstat (limited to 'source/blender/editors/mesh/SConscript')
| -rw-r--r-- | source/blender/editors/mesh/SConscript | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index 88df192c2fa..8142faf67a1 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -3,6 +3,8 @@ Import ('env') sources = env.Glob('*.c') +defs = [] + incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../blenloader' @@ -16,4 +18,10 @@ if env['OURPLATFORM'] == 'linux': 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] ) +if env['WITH_BF_GAMEENGINE']: + incs += ' #/extern/recastnavigation' + defs.append('WITH_GAMEENGINE') +else: + sources.remove('mesh_navmesh.c') + +env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), defs, libtype=['core'], priority=[45] ) |