diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
| commit | e287e9d0c40d1cc9217f4ccfe4e26bbdc407c03e (patch) | |
| tree | ce4f9571c3fd1bbb2c2dc40b8ccd33e107dc36f2 /source/blender/blenkernel/SConscript | |
| parent | f0acdcf13526046236ce561736521100cba58ff1 (diff) | |
| parent | 6d5cf68aaf1347ff7456bb24a6b064c12aad0659 (diff) | |
Merged changes in the trunk up to revision 41387.
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 34da243042d..f69d0d55c76 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -79,8 +79,8 @@ if env['OURPLATFORM'] == 'darwin': if env['WITH_BF_OPENMP']: defs.append('PARALLEL=1') -if env['BF_NO_ELBEEM']: - defs.append('DISABLE_ELBEEM') +if env['WITH_BF_FLUID']: + defs.append('WITH_MOD_FLUID') if env['WITH_BF_LZO']: incs += ' #/extern/lzo/minilzo' |