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/modifiers/CMakeLists.txt
parente59ab6486f9e7285815671044b785c28365d5165 (diff)
parent3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff)
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
-rw-r--r--source/blender/modifiers/CMakeLists.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 6162721d800..b28a79f44f9 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -69,6 +69,7 @@ set(SRC
intern/MOD_multires.c
intern/MOD_ngoninterp.c
intern/MOD_none.c
+ intern/MOD_ocean.c
intern/MOD_particleinstance.c
intern/MOD_particlesystem.c
intern/MOD_screw.c
@@ -118,6 +119,10 @@ if(WITH_MOD_FLUID)
add_definitions(-DWITH_MOD_FLUID)
endif()
+if(WITH_MOD_OCEANSIM)
+ add_definitions(-DWITH_OCEANSIM)
+endif()
+
if(WITH_GAMEENGINE)
# for MOD_navmesh.c
add_definitions(-DWITH_GAMEENGINE)
@@ -127,4 +132,8 @@ if(WITH_GAMEENGINE)
)
endif()
+if(WITH_OPENMP)
+ add_definitions(-DPARALLEL=1)
+endif()
+
blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")