From 16bc962c380ffdd2a89bcccd19a366f27a35cba2 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 11 Jul 2023 09:49:31 -0500 Subject: [PATCH] debug enclosures for suffixed libs --- Engine/source/sfx/openal/linux/LoadOAL.linux.cpp | 10 ++++++++++ Engine/source/sfx/openal/win32/LoadOAL.cpp | 11 ++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp b/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp index 0d380a1b3..0ac1a59b3 100644 --- a/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp +++ b/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp @@ -43,6 +43,15 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable openal_library = dlopen(szOALFullPathName, RTLD_NOW); else { +#ifdef TORQUE_DEBUG + openal_library = dlopen("libopenald.so.1", RTLD_NOW); + + // If the .1 library is not found, try the normal filename + if (openal_library == NULL) + { + openal_library = dlopen("libopenald.so", RTLD_NOW); + } +#else openal_library = dlopen("libopenal.so.1", RTLD_NOW); // If the .1 library is not found, try the normal filename @@ -50,6 +59,7 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable { openal_library = dlopen("libopenal.so", RTLD_NOW); } +#endif } if (openal_library == NULL) { diff --git a/Engine/source/sfx/openal/win32/LoadOAL.cpp b/Engine/source/sfx/openal/win32/LoadOAL.cpp index 14ad3f044..4c1888a69 100644 --- a/Engine/source/sfx/openal/win32/LoadOAL.cpp +++ b/Engine/source/sfx/openal/win32/LoadOAL.cpp @@ -34,9 +34,14 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable if (szOALFullPathName) g_hOpenALDLL = LoadLibraryA(szOALFullPathName); - else - g_hOpenALDLL = LoadLibraryA("openal32.dll"); - + else + { +#ifdef TORQUE_DEBUG + g_hOpenALDLL = LoadLibraryA("openal32d.dll"); +#else + g_hOpenALDLL = LoadLibraryA("openal32.dll"); +#endif + } if (!g_hOpenALDLL) return AL_FALSE;