From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 1 Jun 2005 00:55:06 +0000 (+0000)
Subject: less confusing messages from Sys_LoadLibrary
X-Git-Tag: xonotic-v0.1.0preview~4812
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa69495702c2a056fadd56ab0a19f8fae1c08348;p=xonotic%2Fdarkplaces.git

less confusing messages from Sys_LoadLibrary


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5370 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sys_shared.c b/sys_shared.c
index ed4a487f..f37b67a4 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -46,8 +46,10 @@ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllf
 		*func->funcvariable = NULL;
 
 	// Try every possible name
+	Con_Printf ("Trying to load library...");
 	for (i = 0; dllnames[i] != NULL; i++)
 	{
+		Con_Printf (" \"%s\"", dllnames[i]);
 #ifdef WIN32
 		dllhandle = LoadLibrary (dllnames[i]);
 #else
@@ -55,43 +57,39 @@ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllf
 #endif
 		if (dllhandle)
 			break;
-
-		Con_Printf ("Can't load \"%s\".\n", dllnames[i]);
 	}
 
-	// No DLL found
-	if (! dllhandle)
+	// see if the names can be loaded relative to the executable path
+	// (this is for Mac OSX which does not check next to the executable)
+	if (!dllhandle && strrchr(com_argv[0], '/'))
 	{
-		// see if the names can be loaded relative to the executable path
-		// (this is for Mac OSX which does not check next to the executable)
-		if (strrchr(com_argv[0], '/'))
+		char path[MAX_OSPATH];
+		strlcpy(path, com_argv[0], sizeof(path));
+		strrchr(path, '/')[1] = 0;
+		for (i = 0; dllnames[i] != NULL; i++)
 		{
-			char path[MAX_OSPATH];
-			strlcpy(path, com_argv[0], sizeof(path));
-			strrchr(path, '/')[1] = 0;
-			for (i = 0; dllnames[i] != NULL; i++)
-			{
-				char temp[MAX_OSPATH];
-				strlcpy(temp, path, sizeof(temp));
-				strlcat(temp, dllnames[i], sizeof(temp));
+			char temp[MAX_OSPATH];
+			strlcpy(temp, path, sizeof(temp));
+			strlcat(temp, dllnames[i], sizeof(temp));
+			Con_Printf (" \"%s\"", temp);
 #ifdef WIN32
-				dllhandle = LoadLibrary (temp);
+			dllhandle = LoadLibrary (temp);
 #else
-				dllhandle = dlopen (temp, RTLD_LAZY);
+			dllhandle = dlopen (temp, RTLD_LAZY);
 #endif
-				if (dllhandle)
-					break;
-
-				Con_Printf ("Can't load \"%s\".\n", temp);
-			}
-			if (! dllhandle)
-				return false;
+			if (dllhandle)
+				break;
 		}
-		else
-			return false;
 	}
 
-	Con_Printf("\"%s\" loaded.\n", dllnames[i]);
+	// No DLL found
+	if (! dllhandle)
+	{
+		Con_Printf(" - failed.\n");
+		return false;
+	}
+
+	Con_Printf(" - loaded.\n");
 
 	// Get the function adresses
 	for (func = fcts; func && func->name != NULL; func++)