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 /source/blender/makesrna/SConscript
parente59ab6486f9e7285815671044b785c28365d5165 (diff)
parent3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff)
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'source/blender/makesrna/SConscript')
-rw-r--r--source/blender/makesrna/SConscript3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 816f103cc9d..cf2e888da30 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -55,6 +55,9 @@ if env['WITH_BF_PYTHON']:
if env['WITH_BF_COLLADA']:
defs.append('WITH_COLLADA')
+if env['WITH_BF_OCEANSIM']:
+ defs.append('WITH_OCEANSIM')
+
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'