diff options
| author | Zack Middleton <zturtleman@gmail.com> | 2011-08-29 13:57:46 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:37:17 +0000 |
| commit | a9c5184a64ee625feb78f7b378c8a0cc3f8fc910 (patch) | |
| tree | dd84821004a37dea373c0021293ffc3a55d986b3 /src | |
| parent | 4fe1530338010516157c007cf9e9fbb9492a7914 (diff) | |
- Only need cl_cURLLib cvar if USE_CURL_DLOPEN is defined. - Try to load libcurl-4.dll on win32 (it use to be included in the NSIS installer).
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/cl_curl.c | 3 | ||||
| -rw-r--r-- | src/client/cl_curl.h | 24 | ||||
| -rw-r--r-- | src/client/cl_main.c | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/src/client/cl_curl.c b/src/client/cl_curl.c index fd7f6901..bc64ba75 100644 --- a/src/client/cl_curl.c +++ b/src/client/cl_curl.c @@ -23,11 +23,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef USE_CURL #include "client.h" -cvar_t *cl_cURLLib; #ifdef USE_CURL_DLOPEN #include "../sys/sys_loadlib.h" +cvar_t *cl_cURLLib; + char* (*qcurl_version)(void); CURL* (*qcurl_easy_init)(void); diff --git a/src/client/cl_curl.h b/src/client/cl_curl.h index 7333ae2c..85be1fe6 100644 --- a/src/client/cl_curl.h +++ b/src/client/cl_curl.h @@ -25,28 +25,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef __QCURL_H__ #define __QCURL_H__ -extern cvar_t *cl_cURLLib; - #include "../qcommon/q_shared.h" #include "../qcommon/qcommon.h" -#ifdef WIN32 -#define DEFAULT_CURL_LIB "libcurl-3.dll" -#elif defined(MACOS_X) -#define DEFAULT_CURL_LIB "libcurl.dylib" -#else -#define DEFAULT_CURL_LIB "libcurl.so.4" -#define ALTERNATE_CURL_LIB "libcurl.so.3" -#endif - #ifdef USE_LOCAL_HEADERS #include "../libcurl/curl/curl.h" #else #include <curl/curl.h> #endif - #ifdef USE_CURL_DLOPEN +#ifdef WIN32 + #define DEFAULT_CURL_LIB "libcurl-4.dll" + #define ALTERNATE_CURL_LIB "libcurl-3.dll" +#elif defined(MACOS_X) + #define DEFAULT_CURL_LIB "libcurl.dylib" +#else + #define DEFAULT_CURL_LIB "libcurl.so.4" + #define ALTERNATE_CURL_LIB "libcurl.so.3" +#endif + +extern cvar_t *cl_cURLLib; + extern char* (*qcurl_version)(void); extern CURL* (*qcurl_easy_init)(void); diff --git a/src/client/cl_main.c b/src/client/cl_main.c index c66285dc..aee69445 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -3558,7 +3558,7 @@ void CL_Init( void ) { cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0); cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE); -#ifdef USE_CURL +#ifdef USE_CURL_DLOPEN cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE); #endif com_downloadPrompt = Cvar_Get ("com_downloadPrompt", "0", CVAR_ROM); |