diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /SConstruct | |
parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 161bbbc0378..b5075aa4345 100644 --- a/SConstruct +++ b/SConstruct @@ -254,6 +254,7 @@ if 'blenderlite' in B.targets: target_env_defs['WITH_BF_BINRELOC'] = False target_env_defs['BF_BUILDINFO'] = False target_env_defs['WITH_BF_FLUID'] = False + target_env_defs['WITH_BF_OCEANSIM'] = False target_env_defs['WITH_BF_DECIMATE'] = False target_env_defs['WITH_BF_BOOLEAN'] = False target_env_defs['WITH_BF_PYTHON'] = False @@ -329,6 +330,11 @@ if 'blendernogame' in B.targets: if env['WITH_BF_FLUID'] == 1: env['CPPFLAGS'].append('-DWITH_MOD_FLUID') +# build with ocean sim? +if env['WITH_BF_OCEANSIM'] == 1: + env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it + env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM') + if btools.ENDIAN == "big": env['CPPFLAGS'].append('-D__BIG_ENDIAN__') |