diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:38:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:38:57 +0400 |
| commit | ca662d0fd651ad0fa159bbeacb31a49f11f37526 (patch) | |
| tree | 11aec4952e6d3478b8755850accb300c86591875 /source/blender/modifiers/SConscript | |
| parent | 07687cef7dcfda9e6f668e491515b61c072d82c9 (diff) | |
| parent | 56460a0340b6afdb26fa19eb5bd92eda1a1693aa (diff) | |
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index d6f1d5108f8..635fd2100ba 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -7,8 +7,7 @@ incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include' incs += ' ../render/extern/include ../blenloader ../bmesh' incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel ../blenkernel/intern' -incs += ' ../editors/include ../gpu' -incs += ' #extern/recastnavigation/Recast/Include' +incs += ' ../gpu' incs += ' ' + env['BF_ZLIB_INC'] @@ -21,6 +20,10 @@ defs += ['WITH_MOD_DECIMATE'] if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') +if env['WITH_BF_GAMEENGINE']: + incs += ' #/extern/recastnavigation/Recast/Include' + defs.append('WITH_GAMEENGINE') + env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, libtype=['core','player'], priority = [80, 40] ) |