Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-15 06:58:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-15 06:58:06 +0400
commite6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch)
treee312d2c2f6cb1aaf79148648e5725902ab23d34e /build_files/buildbot/config/user-config-i686.py
parente59ab6486f9e7285815671044b785c28365d5165 (diff)
parent3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff)
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'build_files/buildbot/config/user-config-i686.py')
-rw-r--r--build_files/buildbot/config/user-config-i686.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py
index eb3e321140f..99af7f3fa04 100644
--- a/build_files/buildbot/config/user-config-i686.py
+++ b/build_files/buildbot/config/user-config-i686.py
@@ -109,6 +109,9 @@ BF_BOOST_INC = '${BF_BOOST}/include'
BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++