Преглед изворни кода

debug enclosures for suffixed libs

AzaezelX пре 2 година
родитељ
комит
16bc962c38

+ 10 - 0
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) {

+ 8 - 3
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;