Commit: 5d3ae295d866d47117e9bf6acbcd0c7824db116d
Author: Roman Pogribnyi
Date: Sat Oct 25 12:26:59 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB5d3ae295d866d47117e9bf6acbcd0c7824db116d
compiler flags for osx and linux
===================================================================
M build_files/cmake/macros.cmake
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f1d23f7..86cbe33 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -493,7 +493,7 @@ macro(SETUP_BLENDER_SORTED_LIBS)
bf_render
bf_python
bf_python_ext
- bf_python_manta
+# bf_python_manta # configured separately in
source/creator/CMakeLists.txt
bf_python_mathutils
bf_python_bmesh
bf_freestyle
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 9ccd3ab..de8abbd 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -960,10 +960,17 @@ setup_blender_sorted_libs()
# -----------------------------------------------------------------------------
# Mantaflow Force linking
-SET(MANTA_LINK_LIBRARIES -rdynamic -Wl,-force_load bf_python_manta)
-message("Connecting:" bf_python_manta)
+#PR removed -Wl, -force_load
+#SET(MANTA_LINK_LIBRARIES -rdynamic -Wl,-force_load bf_python_manta)
+if(APPLE)
+ SET(MANTA_LINK_LIBRARIES -force_load bf_python_manta )
+else()
+ SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_python_manta
-Wl,--no-whole-archive )
+endif()
target_link_libraries(blender ${MANTA_LINK_LIBRARIES})
+# -----------------------------------------------------------------------------
+# Setup link libs
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
setup_liblinks(blender)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
