Commit: 4bc5700fc1716c08a708e35a5244d0c99d694763
Author: Sebastián Barschkis
Date: Fri Sep 23 22:57:12 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB4bc5700fc1716c08a708e35a5244d0c99d694763
updated cmake lists to account for windows systems
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2a460a4..6a370d3 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1141,11 +1141,16 @@ setup_blender_sorted_libs()
# -----------------------------------------------------------------------------
# Mantaflow Force linking
-if(APPLE)
- SET(MANTA_LINK_LIBRARIES -force_load bf_intern_mantaflow )
-else()
- SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_intern_mantaflow
-Wl,--no-whole-archive )
+if(UNIX AND NOT APPLE)
+ SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_intern_mantaflow
-Wl,--no-whole-archive)
+
+elseif(WIN32)
+ SET(MANTA_LINK_LIBRARIES bf_intern_mantaflow)
+
+elseif(APPLE)
+ SET(MANTA_LINK_LIBRARIES -force_load bf_intern_mantaflow)
endif()
+
target_link_libraries(blender ${MANTA_LINK_LIBRARIES})
# -----------------------------------------------------------------------------
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
