From 8412ce40ed8f13081bb635089c7513d3585783a9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 22 Nov 2004 09:43:52 +0000 Subject: [PATCH] Fix Mac OS X Webstart OpenAL by searching for thw lwjgl library in addition to the openal library --- src/java/org/lwjgl/openal/AL.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/java/org/lwjgl/openal/AL.java b/src/java/org/lwjgl/openal/AL.java index 9b08f540..c8b54286 100644 --- a/src/java/org/lwjgl/openal/AL.java +++ b/src/java/org/lwjgl/openal/AL.java @@ -146,12 +146,17 @@ public final class AL { } String jwsPath = getPathFromJWS(jwsLibname); - Sys.log("getPathFromJWS: Paths found: " + jwsPath); if (jwsPath != null) { + Sys.log("getPathFromJWS: Path found: " + jwsPath); libpath += seperator + jwsPath.substring(0, jwsPath.lastIndexOf(File.separator)); } - + String lwjgl_jws_path = getPathFromJWS("lwjgl"); + if (lwjgl_jws_path != null) { + Sys.log("getPathFromJWS: Path found: " + lwjgl_jws_path); + libpath += seperator + + lwjgl_jws_path.substring(0, lwjgl_jws_path.lastIndexOf(File.separator)); + } StringTokenizer st = new StringTokenizer(libpath, seperator); //create needed string array @@ -161,10 +166,10 @@ public final class AL { for (int i = 0; i < oalPaths.length - 1; i++) { oalPaths[i] = st.nextToken() + File.separator; } - - for(int i=0 ; i