From bf2ff00518322a7f83c62b780322ce342b1b641a Mon Sep 17 00:00:00 2001 From: Caspian Rychlik-Prince Date: Thu, 12 Jun 2003 15:19:31 +0000 Subject: [PATCH] *** empty log message *** --- src/java/org/lwjgl/openal/BaseAL.java | 5 ----- src/native/common/extal.cpp | 18 +----------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/java/org/lwjgl/openal/BaseAL.java b/src/java/org/lwjgl/openal/BaseAL.java index 1f78536a..77173b8e 100644 --- a/src/java/org/lwjgl/openal/BaseAL.java +++ b/src/java/org/lwjgl/openal/BaseAL.java @@ -65,11 +65,6 @@ public abstract class BaseAL { */ private static void initialize() { System.loadLibrary(org.lwjgl.Sys.getLibraryName()); - try { - System.loadLibrary("OpenAL32"); - } catch (Exception e) { - System.loadLibrary("openal"); - } } /** diff --git a/src/native/common/extal.cpp b/src/native/common/extal.cpp index 52348e00..20eef598 100644 --- a/src/native/common/extal.cpp +++ b/src/native/common/extal.cpp @@ -175,22 +175,6 @@ void* GetFunctionPointer(const char* function) { */ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) { - /* - * CAS: Experimental new code for loading OpenAL. We're ignoring the paths - * and just trying to load it once. - */ - -#ifdef _WIN32 - handleOAL = LoadLibrary("OpenAL32.dll"); -#endif -#ifdef _X11 - handleOAL = dlopen("libopenal.so", RTLD_LAZY); -#endif -#ifdef TARGET_OS_MAC - oalInitEntryPoints(); -#endif - - /* jsize pathcount = env->GetArrayLength(oalPaths); #ifdef _DEBUG printf("Found %d OpenAL paths\n", pathcount); @@ -218,7 +202,7 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) { break; } env->ReleaseStringUTFChars(path, path_str); - */ + } } /**