From 9aee476c6ee8c1faff95f4fa7a37e936d55e235d Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 30 Aug 2014 09:21:19 -0400 Subject: [PATCH] Make plugins use ".plug.dylib" extension on OS X --- library/PluginManager.cpp | 4 ++++ plugins/Plugins.cmake | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp index 28d57c76f..ad390d507 100644 --- 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"; diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake index 832ebebec..e5d0c3bae 100644 --- 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)