fix: correctly load native libraries for OSes and architectures other…

… than Windows
MovingBlocks · Jul 13, 2024 · b81bc8d · b81bc8d
1 parent 7fc7483
commit b81bc8d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/io/github/benjaminamos/tracy/Tracy.java b/src/main/java/io/github/benjaminamos/tracy/Tracy.java
@@ -3,7 +3,7 @@
 
 package io.github.benjaminamos.tracy;
 
-import java.nio.file.Paths;
+import java.io.File;
 
 public final class Tracy {
     private Tracy() {
@@ -12,9 +12,17 @@ private Tracy() {
     static {
         String libraryPath = System.getProperty("org.terasology.librarypath");
         if (libraryPath == null) {
-            System.loadLibrary("tracy-jni");
+            System.loadLibrary("tracy-jni-" + System.getProperty("os.arch"));
         } else {
-            System.load(Paths.get(libraryPath + "/tracy-jni.dll").toAbsolutePath().toString());
+            File libraryDirectory = new File(libraryPath);
+            if (libraryDirectory.exists() && libraryDirectory.isDirectory()) {
+                String architecture = System.getProperty("os.arch");
+                for (File file : libraryDirectory.listFiles()) {
+                    if (file.getName().startsWith("tracy-jni-" + architecture) || file.getName().startsWith("libtracy-jni" + architecture)) {
+                        System.load(file.getPath());
+                    }
+                }
+            }
         }
     }
 

diff --git a/tracy-jni/build.gradle.kts b/tracy-jni/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 version = "1.0.0"
 
 library {
+    baseName = "tracy-jni-"  + System.getProperty("os.arch")
     source.from(file("src"))
     privateHeaders.from(
         file("src"), file("tracy/public"),