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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 93787cdddce..16ce8ca4b32 100644 --- a/SConstruct +++ b/SConstruct @@ -253,7 +253,9 @@ if 'blenderlite' in B.targets: target_env_defs['WITH_BF_BULLET'] = False target_env_defs['WITH_BF_BINRELOC'] = False target_env_defs['BF_BUILDINFO'] = False - target_env_defs['BF_NO_ELBEEM'] = True + target_env_defs['WITH_BF_FLUID'] = False + target_env_defs['WITH_BF_DECIMATE'] = False + target_env_defs['WITH_BF_BOOLEAN'] = False target_env_defs['WITH_BF_PYTHON'] = False target_env_defs['WITH_BF_3DMOUSE'] = False @@ -323,9 +325,9 @@ if 'blenderplayer' in B.targets: if 'blendernogame' in B.targets: env['WITH_BF_GAMEENGINE'] = False -# disable elbeem (fluidsim) compilation? -if env['BF_NO_ELBEEM'] == 1: - env['CPPFLAGS'].append('-DDISABLE_ELBEEM') +# build without elbeem (fluidsim)? +if env['WITH_BF_FLUID'] == 1: + env['CPPFLAGS'].append('-DWITH_MOD_FLUID') if btools.ENDIAN == "big": |