Merge remote-tracking branch 'lethosor/osx-plug-dylib'

Conflicts: NEWS
2014-09-08 13:14:28 -04:00 · 2014-09-08 13:14:28 -04:00 · f5039b37b8
parent 52d0f1c3f6 e7cd7db3ec
commit f5039b37b8
3 changed files with 11 additions and 3 deletions
--- a/6
+++ b/6
@ -1,7 +1,9 @@
 DFHack future

-     Fixes:
-          hack-wish should work now.
+    Internals:
+        - Plugins on OS X now use ".plug.dylib" as an extension instead of ".plug.so"
+    Fixes:
+        - hack-wish should work now

 DFHack v0.40.10-r1

--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@ -696,7 +696,11 @@ void PluginManager::init(Core * core)
 {
 #ifdef LINUX_BUILD
    string path = core->getHackPath() + "plugins/";
+#ifdef _DARWIN
+    const string searchstr = ".plug.dylib";
+#else
    const string searchstr = ".plug.so";
+#endif
 #else
    string path = core->getHackPath() + "plugins\\";
    const string searchstr = ".plug.dll";
--- a/plugins/Plugins.cmake
+++ b/plugins/Plugins.cmake
@ -93,7 +93,9 @@ MACRO(DFHACK_PLUGIN)
    TARGET_LINK_LIBRARIES(${PLUGIN_NAME} dfhack ${PLUGIN_LINK_LIBRARIES})
  ENDIF()

-  IF(UNIX)
+  IF(APPLE)
+    SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dylib PREFIX "")
+  ELSEIF(UNIX)
    SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.so PREFIX "")
  ELSE()
    SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES SUFFIX .plug.dll)