mirror of
https://github.com/shadowfacts/lwjgl2-arm64.git
synced 2026-04-07 07:24:20 +00:00
Fixed Brian's bugs
This commit is contained in:
parent
5ac3ea26e8
commit
f08389fdd2
4 changed files with 46 additions and 48 deletions
|
|
@ -168,30 +168,26 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
|
|||
#ifdef _DEBUG
|
||||
printf("Found %d OpenAL paths\n", pathcount);
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
for(int i=0;i<pathcount;i++) {
|
||||
jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i);
|
||||
const char *path_str = env->GetStringUTFChars(path, NULL);
|
||||
#ifdef _DEBUG
|
||||
printf("Testing '%s'\n", env->GetStringUTFChars(path, NULL));
|
||||
printf("Testing '%s'\n", path_str);
|
||||
#endif
|
||||
handleOAL = LoadLibrary(env->GetStringUTFChars(path, NULL));
|
||||
if (handleOAL != NULL) {
|
||||
#ifdef _DEBUG
|
||||
printf("Found OpenAL at '%s'\n", env->GetStringUTFChars(path, NULL));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
#ifdef _WIN32
|
||||
handleOAL = LoadLibrary(path_str);
|
||||
#endif
|
||||
#ifdef _X11
|
||||
for(int i=0;i<pathcount;i++) {
|
||||
jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i);
|
||||
handleOAL = dlopen(env->GetStringUTFChars(path, NULL), RTLD_LAZY);
|
||||
handleOAL = dlopen(path_str, RTLD_LAZY);
|
||||
#endif
|
||||
if (handleOAL != NULL) {
|
||||
#ifdef _DEBUG
|
||||
printf("Found OpenAL at '%s'\n", path_str);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
env->ReleaseStringUTFChars(path, path_str);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -199,10 +195,10 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
|
|||
*/
|
||||
void UnLoadOpenAL() {
|
||||
#ifdef _WIN32
|
||||
//FreeLibrary(handleOAL);
|
||||
FreeLibrary(handleOAL);
|
||||
#endif
|
||||
#ifdef _X11
|
||||
dlclose(handleOAL);
|
||||
dlclose(handleOAL);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -387,4 +387,4 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_getEnumValue (JNIEnv *env, jobj
|
|||
|
||||
CHECK_ALC_ERROR
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue