diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-19 14:54:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-19 14:55:31 +0300 |
commit | eb844fc1da4b39aea3b9cd1c5091cdb56a81cae0 (patch) | |
tree | dfcc80ed3ea892ec2ddeba21d61d0ebb137f668b /source | |
parent | 60d733c5631666201393d950131581d22c4832ab (diff) |
CMake: fix building without smoke enabled
Was removed when removing sorted libs however it's needed for stubs.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index bc16c8b9a8e..cd612cd9d8c 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -49,6 +49,7 @@ set(INC ../../../intern/libmv ../../../intern/opensubdiv ../../../extern/curve_fit_nd + ../../../intern/smoke/extern ) set(INC_SYS @@ -521,9 +522,6 @@ if(WITH_MOD_FLUID) endif() if(WITH_MOD_SMOKE) - list(APPEND INC - ../../../intern/smoke/extern - ) list(APPEND LIB bf_intern_smoke ) diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index acb0fd350d2..5b720b1557a 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -82,14 +82,13 @@ //#define DEBUG_TIME +#include "smoke_API.h" + #ifdef DEBUG_TIME # include "PIL_time.h" #endif #ifdef WITH_SMOKE - -# include "smoke_API.h" - # include "BLI_task.h" # include "BLI_kdtree.h" # include "BLI_voxel.h" |