macos: look for libjli in both lib and lib/jli

On jdk 17, it is just in lib
runelite · Sep 11, 2021 · 1e9a7fe · 1e9a7fe
1 parent cf9cdf9
commit 1e9a7fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/native/packr/src/macos/packr_macos.cpp b/src/main/native/packr/src/macos/packr_macos.cpp
@@ -111,18 +111,22 @@ int main(int argc, char** argv) {
 bool loadJNIFunctions(GetDefaultJavaVMInitArgs* getDefaultJavaVMInitArgs, CreateJavaVM* createJavaVM) {
 
     char buf[MAXPATHLEN];
-    string path;
+    string cwd;
 
     if (getcwd(buf, sizeof(buf))) {
-        path.append(buf).append("/");
+        cwd.append(buf).append("/");
     }
 
-    path.append("jre/lib/jli/libjli.dylib");
+    string path = cwd + "jre/lib/libjli.dylib";
 
     void* handle = dlopen(path.c_str(), RTLD_LAZY);
     if (handle == NULL) {
-        cerr << dlerror() << endl;
-        return false;
+        path = cwd + "jre/lib/jli/libjli.dylib";
+        handle = dlopen(path.c_str(), RTLD_LAZY);
+        if (handle == NULL) {
+            cerr << dlerror() << endl;
+            return false;
+        }
     }
 
 	*getDefaultJavaVMInitArgs = (GetDefaultJavaVMInitArgs) dlsym(handle, "JNI_GetDefaultJavaVMInitArgs");

diff --git a/src/main/resources/packr-mac b/src/main/resources/packr-mac