Merge pull request #89 from orangetangerine/master

add auto detect dynamic library by ext name & add os xml tag
edvin · Aug 25, 2017 · 98cc4f3 · 98cc4f3
2 parents 460ea5a + 3fe54f0
commit 98cc4f3
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/main/java/fxlauncher/LibraryFile.java b/src/main/java/fxlauncher/LibraryFile.java
@@ -7,7 +7,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.Adler32;
@@ -42,8 +41,17 @@ public LibraryFile(Path basepath, Path file) throws IOException {
 	    String filename = file.getFileName().toString().toLowerCase();
         Pattern osPattern = Pattern.compile(".+-(linux|win|mac)\\.[^.]+$");
         Matcher osMatcher = osPattern.matcher(filename);
-	    if (osMatcher.matches())
-		    this.os = OS.valueOf(osMatcher.group(1));
+	    if (osMatcher.matches()) {
+            this.os = OS.valueOf(osMatcher.group(1));
+        } else {
+	        if (filename.endsWith(".dll")) {
+	            this.os = OS.win;
+            } else if (filename.endsWith(".dylib")) {
+	            this.os = OS.mac;
+            } else if (filename.endsWith(".so")) {
+	            this.os = OS.linux;
+            }
+        }
     }
 
 	public boolean loadForCurrentPlatform() {