MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow ruby plugin to try more than one library path, including libruby.so on Linux

develop
lethosor 2016-11-17 10:31:48 -05:00
parent dce00a5034
commit df9b5bca73
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/ruby/ruby.cpp
Unescape Escape View File

@ -318,22 +318,28 @@ DFHack::DFLibrary *libruby_handle;
// load the ruby library, initialize function pointers // load the ruby library, initialize function pointers
static int df_loadruby(void) static int df_loadruby(void)
{ {
const char *libpath = const char *libpaths[] = {
#if defined(WIN32) #if defined(WIN32)
"./libruby.dll"; "./libruby.dll",
#elif defined(__APPLE__) #elif defined(__APPLE__)
#ifdef DFHACK64 "hack/libruby.dylib",
"/System/Library/Frameworks/Ruby.framework/Ruby"; "/System/Library/Frameworks/Ruby.framework/Ruby",
#else
"hack/libruby.dylib";
#endif
#else #else
"hack/libruby.so"; "hack/libruby.so",
"libruby.so",
#endif #endif
NULL
};
for (const char **path = libpaths; *path; path++) {
if ((libruby_handle = OpenPlugin(*path)))
break;
else
fprintf(stderr, "ruby: warning: Failed to load %s\n", *path);
}
libruby_handle = OpenPlugin(libpath);
if (!libruby_handle) { if (!libruby_handle) {
fprintf(stderr, "Cannot initialize ruby plugin: failed to load %s\n", libpath); Core::printerr("Cannot initialize ruby plugin: failed to load ruby library\n");
return 0; return 0;
} }