diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-10-30 03:56:07 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-10-30 03:56:07 +0400 |
| commit | f837b46a2b561293660a0edf9d4de5ff16922f42 (patch) | |
| tree | 1db91f74223cee5a678bc2d36011ccfd7da4064c /source/blender/modifiers/SConscript | |
| parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) | |
Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)
* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
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 77a2d577fb5..277ed2c3fb3 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' |