From 56f5fedee9b1d2e6ce460a20cbb9860b86c1e365 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Mon, 29 Aug 2011 13:57:46 +0000
Subject: [PATCH] - 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).

---
 code/client/cl_curl.c |  3 ++-
 code/client/cl_curl.h | 24 ++++++++++++------------
 code/client/cl_main.c |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c
index b8508248..d168c412 100644
--- a/code/client/cl_curl.c
+++ b/code/client/cl_curl.c
@@ -22,11 +22,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/code/client/cl_curl.h b/code/client/cl_curl.h
index c8d3006a..d1d08b4f 100644
--- a/code/client/cl_curl.h
+++ b/code/client/cl_curl.h
@@ -24,28 +24,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/code/client/cl_main.c b/code/client/cl_main.c
index fd83db46..aa87b47c 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -3491,7 +3491,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