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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-16 07:11:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-16 07:15:18 +0300
commit813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (patch)
tree65bfb0ea60eb6f595b38fedcf33eb0a59f072cb0 /source/blender/editors/physics
parentbb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff)
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/CMakeLists.txt4
-rw-r--r--source/blender/editors/physics/physics_fluid.c4
2 files changed, 5 insertions, 3 deletions
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"