diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-12-17 11:34:13 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-12-17 11:34:13 +0300 |
| commit | 9a3b3700615e21fd84ec4204962f010e14b2fc43 (patch) | |
| tree | 1b073a2a0cd8de2829cf22561b964fd9791acaed /source/blender/modifiers/CMakeLists.txt | |
| parent | 2b84a7d5b07ff7883997f520b16b467da74515c4 (diff) | |
| parent | 7d2d2ffa76647871836f779f013c99e474228f3d (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index e0232431930..ffc7425adaa 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -31,7 +31,6 @@ set(INC ../makesdna ../makesrna ../render/extern/include - ../../../intern/elbeem/extern ../../../intern/eigen ../../../intern/guardedalloc ) @@ -59,8 +58,7 @@ set(SRC intern/MOD_dynamicpaint.c intern/MOD_edgesplit.c intern/MOD_explode.c - intern/MOD_fluidsim.c - intern/MOD_fluidsim_util.c + intern/MOD_fluid.c intern/MOD_functiondeform_cxx.cc intern/MOD_functiondeform.c intern/MOD_functionpoints_cxx.cc @@ -89,7 +87,6 @@ set(SRC intern/MOD_shrinkwrap.c intern/MOD_simpledeform.c intern/MOD_skin.c - intern/MOD_smoke.c intern/MOD_smooth.c intern/MOD_softbody.c intern/MOD_solidify.c @@ -113,7 +110,6 @@ set(SRC intern/MOD_wireframe.c MOD_modifiertypes.h - intern/MOD_fluidsim_util.h intern/MOD_meshcache_util.h intern/MOD_solidify_util.h intern/MOD_util.h @@ -148,7 +144,7 @@ if(WITH_MOD_REMESH) endif() if(WITH_MOD_FLUID) - add_definitions(-DWITH_MOD_FLUID) + add_definitions(-DWITH_FLUID) endif() if(WITH_MOD_OCEANSIM) |