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/blenkernel/CMakeLists.txt | |
parent | 2b84a7d5b07ff7883997f520b16b467da74515c4 (diff) | |
parent | 7d2d2ffa76647871836f779f013c99e474228f3d (diff) |
Merge branch 'master' into functions
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 3c912a4da70..053d9c17e1a 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,7 @@ set(SRC intern/editmesh_tangent.c intern/effect.c intern/fcurve.c - intern/fluidsim.c + intern/fluid.c intern/fmodifier.c intern/font.c intern/freestyle.c @@ -201,7 +201,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 @@ -286,7 +285,7 @@ set(SRC BKE_editmesh_tangent.h BKE_effect.h BKE_fcurve.h - BKE_fluidsim.h + BKE_fluid.h BKE_font.h BKE_freestyle.h BKE_global.h @@ -349,7 +348,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 @@ -536,20 +534,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) |