From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 17 May 2007 09:38:46 +0000 (+0000)
Subject: libcurl-4; vid_glx: RTLD_GLOBAL (apparently FreeBSD users need it)
X-Git-Tag: xonotic-v0.1.0preview~3159
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7a2c4f80c52a0ed0cd85b46646b693f7dc79f7b;p=xonotic%2Fdarkplaces.git

libcurl-4; vid_glx: RTLD_GLOBAL (apparently FreeBSD users need it)


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

diff --git a/libcurl.c b/libcurl.c
index afbab1aa..b7956ff6 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -311,12 +311,16 @@ static qboolean CURL_OpenLibrary (void)
 #if defined(WIN64)
 		"libcurl64.dll",
 #elif defined(WIN32)
+		"libcurl-4.dll",
 		"libcurl-3.dll",
 #elif defined(MACOSX)
+		"libcurl.4.dylib", // Mac OS X Notyetreleased
 		"libcurl.3.dylib", // Mac OS X Tiger
 		"libcurl.2.dylib", // Mac OS X Panther
 #else
+		"libcurl.so.4",
 		"libcurl.so.3",
+		"libcurl.so", // FreeBSD
 #endif
 		NULL
 	};
diff --git a/vid_glx.c b/vid_glx.c
index 291f5d5a..caa1f0d4 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -487,7 +487,7 @@ static int GL_OpenLibrary(const char *name)
 {
 	Con_Printf("Loading OpenGL driver %s\n", name);
 	GL_CloseLibrary();
-	if (!(prjobj = dlopen(name, RTLD_LAZY)))
+	if (!(prjobj = dlopen(name, RTLD_LAZY | RTLD_GLOBAL)))
 	{
 		Con_Printf("Unable to open symbol list for %s\n", name);
 		return false;