summaryrefslogtreecommitdiff
path: root/src/client/cl_curl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/cl_curl.c')
-rw-r--r--src/client/cl_curl.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/src/client/cl_curl.c b/src/client/cl_curl.c
index 63958e38..f8f6580d 100644
--- a/src/client/cl_curl.c
+++ b/src/client/cl_curl.c
@@ -95,30 +95,19 @@ qboolean CL_cURL_Init()
Com_Printf("Loading \"%s\"...", cl_cURLLib->string);
- if( (cURLLib = Sys_LoadLibrary(cl_cURLLib->string)) == 0 )
+ if(!(cURLLib = Sys_LoadDll(cl_cURLLib->string)))
{
#ifdef _WIN32
return qfalse;
+
+#elsif ALTERNATE_CURL_LIB
+ // On some linux distributions there is no libcurl.so.3, but only libcurl.so.4. That one works too.
+ if(!(cURLLib = Sys_LoadDll(ALTERNATE_CURL_LIB)))
+ return qfalse;
#else
- char fn[1024];
-
- Q_strncpyz( fn, Sys_Cwd( ), sizeof( fn ) );
- strncat(fn, "/", sizeof(fn)-strlen(fn)-1);
- strncat(fn, cl_cURLLib->string, sizeof(fn)-strlen(fn)-1);
-
- if((cURLLib = Sys_LoadLibrary(fn)) == 0)
- {
-#ifdef ALTERNATE_CURL_LIB
- // On some linux distributions there is no libcurl.so.3, but only libcurl.so.4. That one works too.
- if( (cURLLib = Sys_LoadLibrary(ALTERNATE_CURL_LIB)) == 0 )
- {
- return qfalse;
- }
-#else
+
return qfalse;
#endif
- }
-#endif /* _WIN32 */
}
clc.cURLEnabled = qtrue;