diff --git a/src/java/org/lwjgl/Display.java b/src/java/org/lwjgl/Display.java index 12cd3cf1..69577cb6 100644 --- a/src/java/org/lwjgl/Display.java +++ b/src/java/org/lwjgl/Display.java @@ -46,7 +46,7 @@ package org.lwjgl; public final class Display { static { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); } /** Has the display been created? */ diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java index ddd38f56..d532aa40 100644 --- a/src/java/org/lwjgl/Sys.java +++ b/src/java/org/lwjgl/Sys.java @@ -79,7 +79,7 @@ public final class Sys { } /** The native library name */ - public static String LIBRARY_NAME; + private static String LIBRARY_NAME; static { try { @@ -91,6 +91,13 @@ public final class Sys { LIBRARY_NAME = "lwjgl_d"; } } + + /** + * @return the name of the native library to load + */ + public static String getLibraryName() { + return LIBRARY_NAME; + } /** * No constructor for Sys. diff --git a/src/java/org/lwjgl/input/GamePad.java b/src/java/org/lwjgl/input/GamePad.java index 7934a13b..b99400f0 100644 --- a/src/java/org/lwjgl/input/GamePad.java +++ b/src/java/org/lwjgl/input/GamePad.java @@ -103,7 +103,7 @@ public class GamePad { * Static initialization */ private static void initialize() { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); initIDs(); } diff --git a/src/java/org/lwjgl/input/Joystick.java b/src/java/org/lwjgl/input/Joystick.java index 32bd12a0..23d8f72a 100644 --- a/src/java/org/lwjgl/input/Joystick.java +++ b/src/java/org/lwjgl/input/Joystick.java @@ -81,7 +81,7 @@ public class Joystick { * Static initialization */ private static void initialize() { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); initIDs(); } diff --git a/src/java/org/lwjgl/input/Keyboard.java b/src/java/org/lwjgl/input/Keyboard.java index 2025a90e..101da291 100644 --- a/src/java/org/lwjgl/input/Keyboard.java +++ b/src/java/org/lwjgl/input/Keyboard.java @@ -211,7 +211,7 @@ public class Keyboard { * Static initialization */ private static void initialize() { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); initIDs(); } diff --git a/src/java/org/lwjgl/input/Mouse.java b/src/java/org/lwjgl/input/Mouse.java index 30d55356..1fa25302 100644 --- a/src/java/org/lwjgl/input/Mouse.java +++ b/src/java/org/lwjgl/input/Mouse.java @@ -79,7 +79,7 @@ public class Mouse { * Static initialization */ private static void initialize() { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); initIDs(); } diff --git a/src/java/org/lwjgl/opengl/BaseGL.java b/src/java/org/lwjgl/opengl/BaseGL.java index deaa4764..fcb56f17 100644 --- a/src/java/org/lwjgl/opengl/BaseGL.java +++ b/src/java/org/lwjgl/opengl/BaseGL.java @@ -53,7 +53,7 @@ import org.lwjgl.Sys; abstract class BaseGL { static { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); } /** The current rendering context */ diff --git a/src/java/org/lwjgl/opengl/CoreGL.java b/src/java/org/lwjgl/opengl/CoreGL.java index c97fe699..61768f43 100644 --- a/src/java/org/lwjgl/opengl/CoreGL.java +++ b/src/java/org/lwjgl/opengl/CoreGL.java @@ -44,10 +44,6 @@ import org.lwjgl.Sys; */ public class CoreGL extends BaseGL implements CoreGLConstants { - static { - System.loadLibrary(Sys.LIBRARY_NAME); - } - /** * Constructor for CoreGL. */ diff --git a/src/java/org/lwjgl/opengl/GL.java b/src/java/org/lwjgl/opengl/GL.java index 73fbf696..41c8c447 100644 --- a/src/java/org/lwjgl/opengl/GL.java +++ b/src/java/org/lwjgl/opengl/GL.java @@ -1443,10 +1443,6 @@ public class GL extends CoreGL implements GLConstants { int outZ, int outW); - static { - System.loadLibrary(Sys.LIBRARY_NAME); - } - /* * Available extensions */ diff --git a/src/java/org/lwjgl/opengl/GLU.java b/src/java/org/lwjgl/opengl/GLU.java index 687e6023..54044d83 100644 --- a/src/java/org/lwjgl/opengl/GLU.java +++ b/src/java/org/lwjgl/opengl/GLU.java @@ -45,7 +45,7 @@ import org.lwjgl.Sys; public class GLU implements GLUConstants { static { - System.loadLibrary(Sys.LIBRARY_NAME); + System.loadLibrary(Sys.getLibraryName()); } /** Handle to GL */