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 /build_files/scons/tools/btools.py | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'build_files/scons/tools/btools.py')
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 417bbcc48ba..856231e3c84 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -152,6 +152,7 @@ def validate_arguments(args, bc): 'WITH_BF_FLUID', 'WITH_BF_DECIMATE', 'WITH_BF_BOOLEAN', + 'WITH_BF_OCEANSIM', 'WITH_BF_CXX_GUARDEDALLOC', 'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC', 'BUILDBOT_BRANCH', @@ -259,6 +260,7 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)), (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)), (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)), + (BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)), ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''), (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)), ('BF_OPENAL', 'Base path for OpenAL', ''), |