From 2107cdc40c9205367e850e1eae21db70a2cd184b Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 16 Jun 2003 17:05:48 +0000 Subject: [PATCH] Cleaned up JWS openal loading --- src/java/org/lwjgl/openal/BaseAL.java | 7 +++---- src/java/org/lwjgl/opengl/CoreGL.java | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/java/org/lwjgl/openal/BaseAL.java b/src/java/org/lwjgl/openal/BaseAL.java index 167a5bfb..277b979e 100644 --- a/src/java/org/lwjgl/openal/BaseAL.java +++ b/src/java/org/lwjgl/openal/BaseAL.java @@ -94,8 +94,8 @@ public abstract class BaseAL { // try to get path from JWS (if possible) String jwsLibname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) - ? "openal.so" - : "OpenAL32.dll"; + ? "openal" + : "OpenAL32"; String jwsPath = getPathFromJWS(jwsLibname); if (jwsPath != null) { @@ -135,7 +135,6 @@ public abstract class BaseAL { */ private String getPathFromJWS(String libname) { try { - libname = libname.substring(0, libname.lastIndexOf(".")); if(Sys.DEBUG) { System.out.println("JWS Classloader looking for: " + libname); @@ -180,4 +179,4 @@ public abstract class BaseAL { * Native method the destroy the AL */ protected native void nDestroy(); -} \ No newline at end of file +} diff --git a/src/java/org/lwjgl/opengl/CoreGL.java b/src/java/org/lwjgl/opengl/CoreGL.java index 3306112e..e89325ab 100644 --- a/src/java/org/lwjgl/opengl/CoreGL.java +++ b/src/java/org/lwjgl/opengl/CoreGL.java @@ -32,6 +32,8 @@ package org.lwjgl.opengl; +import java.nio.ByteBuffer; + /** * $Id$ *