Commit: 0f8dabc1d710765ccbafac828522da3a05698a3f
Author: Roman Pogribnyi
Date: Fri Aug 1 19:33:39 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB0f8dabc1d710765ccbafac828522da3a05698a3f
imorting mantaflow correctly in Unix
===================================================================
A source/creator/CMakeLists (Autosaved).txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists
(Autosaved).txt
similarity index 99%
copy from source/creator/CMakeLists.txt
copy to source/creator/CMakeLists (Autosaved).txt
index 2fbe29b..7d434c4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists (Autosaved).txt
@@ -1149,9 +1149,9 @@ endif()
#linking manta library
#PR removed -Wl, -force_load
if(APPLE)
- SET(MANTA_LINK_LIBRARIES -force_load bf_python_manta )
+ SET(MANTA_LINK_LIBRARIES -Wl,-force_load bf_python_manta )
else()
- SET(MANTA_LINK_LIBRARIES -Wl, --whole-archive -lbf_python_manta
-Wl,--no-whole-archive )
+ SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive -lbf_python_manta
-Wl,--no-whole-archive )
endif()
#-Wl,--whole-archive bf_python_manta -Wl,--no-whole-archive)
TARGET_LINK_LIBRARIES(blender ${MANTA_LINK_LIBRARIES})
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2fbe29b..efd678c 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1147,11 +1147,10 @@ endif()
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
#linking manta library
- #PR removed -Wl, -force_load
if(APPLE)
SET(MANTA_LINK_LIBRARIES -force_load bf_python_manta )
else()
- SET(MANTA_LINK_LIBRARIES -Wl, --whole-archive -lbf_python_manta
-Wl,--no-whole-archive )
+ SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_python_manta
-Wl,--no-whole-archive )
endif()
#-Wl,--whole-archive bf_python_manta -Wl,--no-whole-archive)
TARGET_LINK_LIBRARIES(blender ${MANTA_LINK_LIBRARIES})
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
