Merge pull request #104 from Kontiterit/main

fix: add back support for MSVC-built GTK in LibLoad
jwharm · Jun 5, 2024 · cae677d · cae677d
2 parents 9ea9d91 + c811d38
commit cae677d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/modules/glib/src/main/java/io/github/jwharm/javagi/interop/LibLoad.java b/modules/glib/src/main/java/io/github/jwharm/javagi/interop/LibLoad.java
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.stream.Stream;
 
 /**
@@ -79,12 +81,16 @@ public static void loadLibrary(String name) {
                 continue;
             }
 
+            Set<String> possibleNames = new HashSet<>();
+            possibleNames.add(name);
+            if (Platform.getRuntimePlatform().equals("windows") && name.startsWith("lib")) {
+                possibleNames.add(name.substring(3));
+            }
             // Find the file with the requested library name
             for (Path path : files) {
                 try {
                     String fn = path.getFileName().toString();
-                    if (fn.equals(name)) {
-
+                    if (possibleNames.contains(fn)) {
                         // Load the library
                         System.load(path.toString());
                         return;