okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Move the conditional compilation of bg_lib.c from the Makefile to cpp in

Browse source 
order to force dependency generation on bg_lib.*
* Make testing USE_ defines more consistent
This commit is contained in:
Tim Angus 2007-09-22 20:32:11 +00:00
parent 60260f1c60
commit 7562caa310
13 changed files with 55 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

10
code/client/cl_main.c
View file

@ -689,7 +689,7 @@ CL_ShutdownAll
*/
void CL_ShutdownAll(void) {
#if USE_CURL
#ifdef USE_CURL
CL_cURL_Shutdown();
#endif
// clear sounds
@ -1451,7 +1451,7 @@ Called when all downloading has been completed
*/
void CL_DownloadsComplete( void ) {
#if USE_CURL
#ifdef USE_CURL
// if we downloaded with cURL
if(clc.cURLUsed) {
clc.cURLUsed = qfalse;
@ -1579,7 +1579,7 @@ void CL_NextDownload(void) {
*s++ = 0;
else
s = localName + strlen(localName); // point at the nul byte
#if USE_CURL
#ifdef USE_CURL
if(!(cl_allowDownload->integer & DLF_NO_REDIRECT)) {
if(clc.sv_allowDownload & DLF_NO_REDIRECT) {
Com_Printf("WARNING: server does not "
@ -2205,7 +2205,7 @@ void CL_Frame ( int msec ) {
return;
}
#if USE_CURL
#ifdef USE_CURL
if(clc.downloadCURLM) {
CL_cURL_PerformDownload();
// we can't process frames normally when in disconnected
@ -2698,7 +2698,7 @@ void CL_Init( void ) {
cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0);
cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE);
#if USE_CURL
#ifdef USE_CURL
cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE);
#endif