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:
authorJacques Lucke <jacques@blender.org>2020-07-17 14:47:57 +0300
committerJacques Lucke <jacques@blender.org>2020-07-17 14:49:18 +0300
commit3ef59121a49b986700747469850e02f6420ee8aa (patch)
tree9a6dc6b823ebd355e227ce0ad0427f8d1a4c8e39 /source/blender/simulation/CMakeLists.txt
parent9582797d4b50a18040e96ae07aa8c7643cbcc25a (diff)
Simulation: move initial simulation code from bf_blenkernel to bf_simulation
I removed bf_blenkernel from `nodes/CMakeLists.txt` again (added it yesterday), because now this was causing me unresolved symbol errors... Without it, cmake seems to link the libraries bf_simulation, bf_blenkernel and bf_nodes in the right order. Not sure if that is just luck or if it is guaranteed. It was possible to fix the issue by using cmakes `LINK_INTERFACE_MULTIPLICITY`, but that is probably bad style.
Diffstat (limited to 'source/blender/simulation/CMakeLists.txt')
-rw-r--r--source/blender/simulation/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt
index c87d9330f2d..f9fc0b5c798 100644
--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -24,8 +24,11 @@ set(INC
../blenkernel
../blenlib
../depsgraph
+ ../functions
../imbuf
../makesdna
+ ../makesrna
+ ../nodes
../../../intern/guardedalloc
)
@@ -41,11 +44,15 @@ set(SRC
intern/implicit.h
intern/implicit_blender.c
intern/implicit_eigen.cpp
+ intern/simulation_update.cc
SIM_mass_spring.h
+ SIM_simulation_update.hh
)
set(LIB
+ bf_blenkernel
+ bf_nodes
)
if(WITH_OPENMP_STATIC)