diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-11-13 16:17:27 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-11-13 16:17:27 +0400 |
| commit | 11c83d843206648a33bcc8b4d754577ec0a51d2a (patch) | |
| tree | 58af33c372ba5d77f68d6ed7b37e5aecd6e6c678 /source/blender/blenkernel/CMakeLists.txt | |
| parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) | |
Ocean Sim modifier patch
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 1fc851bfa72..4e7561a1bc8 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -117,6 +117,7 @@ set(SRC intern/multires.c intern/nla.c intern/node.c + intern/ocean.c intern/object.c intern/packedFile.c intern/paint.c @@ -204,6 +205,7 @@ set(SRC BKE_multires.h BKE_nla.h BKE_node.h + BKE_ocean.h BKE_object.h BKE_packedFile.h BKE_paint.h @@ -341,6 +343,10 @@ if(WITH_MOD_SMOKE) add_definitions(-DWITH_SMOKE) endif() +if(WITH_OCEANSIM) + add_definitions(-DWITH_OCEANSIM) +endif() + if(WITH_JACK) add_definitions(-DWITH_JACK) endif() @@ -378,6 +384,11 @@ if(WITH_LIBMV) add_definitions(-DWITH_LIBMV) endif() +if(WITH_FFTW3) + list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS}) + add_definitions(-DFFTW3=1) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |