From f84e2ceb26b834202f01a4f8458a2559526fa5e5 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 23 Feb 2005 11:22:14 +0000 Subject: [PATCH] Linux: Make sure libjawt.so can be loaded --- src/java/org/lwjgl/LinuxSysImplementation.java | 4 ++++ src/java/org/lwjgl/Sys.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/java/org/lwjgl/LinuxSysImplementation.java b/src/java/org/lwjgl/LinuxSysImplementation.java index 66d445fb..0cec51af 100644 --- a/src/java/org/lwjgl/LinuxSysImplementation.java +++ b/src/java/org/lwjgl/LinuxSysImplementation.java @@ -40,6 +40,10 @@ import java.io.IOException; * @version $Revision$ */ class LinuxSysImplementation extends J2SESysImplementation { + static { + java.awt.Toolkit.getDefaultToolkit(); // This will make sure libjawt.so is loaded + } + public boolean openURL(String url) { // Linux may as well resort to pure Java hackery, as there's no Linux native way of doing it // right anyway. diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java index cf2fe98a..f83ceef4 100644 --- a/src/java/org/lwjgl/Sys.java +++ b/src/java/org/lwjgl/Sys.java @@ -63,8 +63,8 @@ public final class Sys { private final static SysImplementation implementation; static { - System.loadLibrary(LIBRARY_NAME); implementation = createImplementation(); + System.loadLibrary(LIBRARY_NAME); String native_version = implementation.getNativeLibraryVersion(); if (!native_version.equals(VERSION)) throw new LinkageError("Version mismatch: jar version is '" + VERSION +