Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/ScriptReloadMgr: Fixed scripts hot swapping on OS X (#19365)

Browse Source
This commit is contained in:
S.V
2017-03-31 23:10:18 +02:00
committed by Gacko
parent 0b0d4c4011
commit 886e9e839b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/macros/ConfigureScripts.cmake
View File

@@ -85,10 +85,12 @@ function(IsDynamicLinkingRequired variable)
set(${variable} ${IS_REQUIRED} PARENT_SCOPE)
endfunction()
# Stores the native variable name
# Stores the native variable name
function(GetNativeSharedLibraryName module variable)
if(WIN32)
set(${variable} "${module}.dll" PARENT_SCOPE)
elseif(APPLE)
set(${variable} "lib${module}.dylib" PARENT_SCOPE)
else()
set(${variable} "lib${module}.so" PARENT_SCOPE)
endif()

9
src/server/game/Scripting/ScriptReloadMgr.cpp
View File

@@ -66,6 +66,9 @@ namespace fs = boost::filesystem;
#ifdef _WIN32
#include <windows.h>
#define HOTSWAP_PLATFORM_REQUIRES_CACHING
#elif __APPLE__
#include <dlfcn.h>
#define HOTSWAP_PLATFORM_REQUIRES_CACHING
#else // Posix
#include <dlfcn.h>
// #define HOTSWAP_PLATFORM_REQUIRES_CACHING
@@ -86,11 +89,13 @@ static char const* GetSharedLibraryPrefix()
#endif
}
// Returns "dll" on Windows and "so" on posix.
// Returns "dll" on Windows, "dylib" on OS X, and "so" on posix.
static char const* GetSharedLibraryExtension()
{
#ifdef _WIN32
return "dll";
#elif __APPLE__
return "dylib";
#else // Posix
return "so";
#endif
@@ -111,7 +116,7 @@ static fs::path GetDirectoryOfExecutable()
if (path.is_absolute())
return path.parent_path();
else
return fs::absolute(path).parent_path();
return fs::canonical(fs::absolute(path)).parent_path();
}
class SharedLibraryUnloader