From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:11:27 +0200 Subject: CMake: cleanup, arg rename, add definitions last --- source/blender/editors/physics/CMakeLists.txt | 4 +++- source/blender/editors/physics/physics_fluid.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/physics') diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 1b42c3f2669..25b76f549a2 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -25,7 +25,6 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager - ../../../../intern/elbeem/extern ../../../../intern/guardedalloc ../../../../intern/glew-mx ) @@ -55,6 +54,9 @@ set(LIB ) if(WITH_MOD_FLUID) + list(APPEND INC + ../../../../intern/elbeem/extern + ) add_definitions(-DWITH_MOD_FLUID) endif() diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 9192d1c2fe9..d3b57a09a9e 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -45,8 +45,6 @@ #include "DEG_depsgraph.h" -#include "LBM_fluidsim.h" - #include "ED_screen.h" #include "WM_types.h" @@ -57,6 +55,8 @@ /* enable/disable overall compilation */ #ifdef WITH_MOD_FLUID +#include "LBM_fluidsim.h" + #include "BLI_blenlib.h" #include "BLI_path_util.h" #include "BLI_math.h" -- cgit v1.2.3