fix(jawt): add java.home fallback

This is useful when the default java.library.path does not include the JRE bin directory (e.g. when the JVM is launched via the JDK's java executable).
LWJGL · Nov 28, 2017 · d20409b · d20409b
1 parent e07531e
commit d20409b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/modules/core/src/main/java/org/lwjgl/system/Library.java b/modules/core/src/main/java/org/lwjgl/system/Library.java
@@ -204,14 +204,15 @@ public static SharedLibrary loadNative(Class<?> context, String name) {
     public static SharedLibrary loadNative(Class<?> context, String name, boolean bundledWithLWJGL) {
         apiLog("Loading library: " + name);
 
+        String libName = Platform.get().mapLibraryName(name);
+
         // METHOD 1: absolute path
-        if (new File(name).isAbsolute()) {
-            SharedLibrary lib = apiCreateLibrary(name);
+        if (new File(libName).isAbsolute()) {
+            SharedLibrary lib = apiCreateLibrary(libName);
             apiLog("\tSuccess");
             return lib;
         }
 
-        String        libName = Platform.get().mapLibraryName(name);
         SharedLibrary lib;
 
         // METHOD 2: org.lwjgl.librarypath

diff --git a/modules/templates/src/main/kotlin/org/lwjgl/system/jawt/templates/jawt.kt b/modules/templates/src/main/kotlin/org/lwjgl/system/jawt/templates/jawt.kt
@@ -10,7 +10,7 @@ import org.lwjgl.system.jni.*
 
 val jawt = "JAWTFunctions".nativeClass(JAWT_PACKAGE, prefix = "JAWT_", prefixMethod = "JAWT_", binding = simpleBinding(
     "jawt",
-    libraryExpression = """Configuration.JAWT_LIBRARY_NAME.get("jawt")""",
+    libraryExpression = """Configuration.JAWT_LIBRARY_NAME, "jawt", System.getProperty("java.home") + "/bin/jawt"""",
     callingConvention = CallingConvention.STDCALL
 )) {
     nativeDirective(