diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
| commit | bd86ba2c88aa912eefb38dc4a809f1ca1e49a31f (patch) | |
| tree | b2464a5cc64089772d52c5e9e740a73210d60e6d /source/blender/modifiers/SConscript | |
| parent | e48d7f4c111ea61eec467e972be1005f953768b1 (diff) | |
| parent | f837b46a2b561293660a0edf9d4de5ff16922f42 (diff) | |
svn merge -r41335:41371
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index c1f2ca63f6b..c330733e942 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -13,12 +13,14 @@ incs += ' ' + env['BF_ZLIB_INC'] defs = [] -# could be made optional -defs += ['WITH_MOD_BOOLEAN'] -defs += ['WITH_MOD_DECIMATE'] +if env ['WITH_BF_BOOLEAN']: + defs.append('WITH_MOD_BOOLEAN') -if env['BF_NO_ELBEEM']: - defs.append('DISABLE_ELBEEM') +if env ['WITH_BF_DECIMATE']: + defs.append('WITH_MOD_DECIMATE') + +if env['WITH_BF_FLUID']: + defs.append('WITH_MOD_FLUID') if env['WITH_BF_GAMEENGINE']: incs += ' #/extern/recastnavigation' |