diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:50:14 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 18:37:01 +0300 |
commit | d27ccf990c2b957a10f4676e3153f907829a4b22 (patch) | |
tree | 48667db9d5f51e3c951cb1106566a53db21d9adf /source/blender/blenkernel/CMakeLists.txt | |
parent | 7b87d3d34ec5bbaf777bdc27abdb69600915fce1 (diff) |
Mantaflow [Part 6]: Updates in /blender/source
A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming.
Reviewed By: sergey
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3855
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 88a3629ea3f..ad84a1b579c 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -45,11 +45,11 @@ set(INC ../../../intern/atomic ../../../intern/clog ../../../intern/libmv + ../../../intern/mantaflow/extern ../../../intern/memutil ../../../intern/mikktspace ../../../intern/opensubdiv ../../../extern/curve_fit_nd - ../../../intern/smoke/extern # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern @@ -114,7 +114,6 @@ set(SRC intern/editmesh_tangent.c intern/effect.c intern/fcurve.c - intern/fluidsim.c intern/fmodifier.c intern/font.c intern/freestyle.c @@ -144,6 +143,7 @@ set(SRC intern/lightprobe.c intern/linestyle.c intern/main.c + intern/fluid.c intern/mask.c intern/mask_evaluate.c intern/mask_rasterize.c @@ -198,7 +198,6 @@ set(SRC intern/sequencer.c intern/shader_fx.c intern/shrinkwrap.c - intern/smoke.c intern/softbody.c intern/sound.c intern/speaker.c @@ -281,7 +280,6 @@ set(SRC BKE_editmesh_tangent.h BKE_effect.h BKE_fcurve.h - BKE_fluidsim.h BKE_font.h BKE_freestyle.h BKE_global.h @@ -307,6 +305,7 @@ set(SRC BKE_lightprobe.h BKE_linestyle.h BKE_main.h + BKE_fluid.h BKE_mask.h BKE_material.h BKE_mball.h @@ -341,7 +340,6 @@ set(SRC BKE_sequencer.h BKE_shader_fx.h BKE_shrinkwrap.h - BKE_smoke.h BKE_softbody.h BKE_sound.h BKE_speaker.h @@ -526,20 +524,10 @@ if(WITH_PYTHON) endif() if(WITH_MOD_FLUID) - list(APPEND INC - ../../../intern/elbeem/extern - ) - list(APPEND LIB - bf_intern_elbeem - ) - add_definitions(-DWITH_MOD_FLUID) -endif() - -if(WITH_MOD_SMOKE) list(APPEND LIB - bf_intern_smoke + bf_intern_mantaflow ) - add_definitions(-DWITH_SMOKE) + add_definitions(-DWITH_FLUID) endif() if(WITH_MOD_OCEANSIM) |