r1186 - in trunk: . code/client code/game code/qcommon
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Sep 22 16:32:11 EDT 2007
Author: tma
Date: 2007-09-22 16:32:11 -0400 (Sat, 22 Sep 2007)
New Revision: 1186
Modified:
trunk/Makefile
trunk/code/client/cl_curl.c
trunk/code/client/cl_curl.h
trunk/code/client/cl_main.c
trunk/code/client/client.h
trunk/code/client/qal.c
trunk/code/client/qal.h
trunk/code/client/snd_codec.c
trunk/code/client/snd_codec_ogg.c
trunk/code/client/snd_openal.c
trunk/code/game/bg_lib.c
trunk/code/game/bg_lib.h
trunk/code/qcommon/q_shared.h
Log:
* Move the conditional compilation of bg_lib.c from the Makefile to cpp in
order to force dependency generation on bg_lib.*
* Make testing USE_ defines more consistent
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/Makefile 2007-09-22 20:32:11 UTC (rev 1186)
@@ -185,21 +185,21 @@
-pipe -DUSE_ICON $(shell sdl-config --cflags)
ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1
+ BASE_CFLAGS += -DUSE_OPENAL
ifeq ($(USE_OPENAL_DLOPEN),1)
- BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
endif
endif
ifeq ($(USE_CURL),1)
- BASE_CFLAGS += -DUSE_CURL=1
+ BASE_CFLAGS += -DUSE_CURL
ifeq ($(USE_CURL_DLOPEN),1)
- BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_CURL_DLOPEN
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
- BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+ BASE_CFLAGS += -DUSE_CODEC_VORBIS
endif
OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
@@ -338,25 +338,25 @@
BASE_CFLAGS += -gfull
ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1
+ BASE_CFLAGS += -DUSE_OPENAL
ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LDFLAGS += -framework OpenAL
else
- BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
endif
endif
ifeq ($(USE_CURL),1)
- BASE_CFLAGS += -DUSE_CURL=1
+ BASE_CFLAGS += -DUSE_CURL
ifneq ($(USE_CURL_DLOPEN),1)
CLIENT_LDFLAGS += -lcurl
else
- BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_CURL_DLOPEN
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
- BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+ BASE_CFLAGS += -DUSE_CODEC_VORBIS
CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
endif
@@ -405,18 +405,18 @@
-DUSE_ICON -I$(SDLHDIR)/include
ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN
endif
ifeq ($(USE_CURL),1)
- BASE_CFLAGS += -DUSE_CURL=1
+ BASE_CFLAGS += -DUSE_CURL
ifneq ($(USE_CURL_DLOPEN),1)
BASE_CFLAGS += -DCURL_STATICLIB
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
- BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+ BASE_CFLAGS += -DUSE_CODEC_VORBIS
endif
OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
@@ -479,14 +479,14 @@
-DUSE_ICON $(shell sdl-config --cflags)
ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1
+ BASE_CFLAGS += -DUSE_OPENAL
ifeq ($(USE_OPENAL_DLOPEN),1)
- BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
+ BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
- BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+ BASE_CFLAGS += -DUSE_CODEC_VORBIS
endif
ifeq ($(ARCH),axp)
@@ -709,7 +709,7 @@
endif
ifeq ($(USE_LOCAL_HEADERS),1)
- BASE_CFLAGS += -DUSE_LOCAL_HEADERS=1
+ BASE_CFLAGS += -DUSE_LOCAL_HEADERS
endif
ifeq ($(GENERATE_DEPENDENCIES),1)
@@ -1354,6 +1354,7 @@
$(B)/baseq3/game/bg_misc.o \
$(B)/baseq3/game/bg_pmove.o \
$(B)/baseq3/game/bg_slidemove.o \
+ $(B)/baseq3/game/bg_lib.o \
$(B)/baseq3/cgame/cg_consolecmds.o \
$(B)/baseq3/cgame/cg_draw.o \
$(B)/baseq3/cgame/cg_drawtools.o \
@@ -1376,7 +1377,7 @@
$(B)/baseq3/qcommon/q_shared.o
Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
-Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
+Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm)
$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT): $(Q3CGOBJ)
$(echo_cmd) "LD $@"
@@ -1395,6 +1396,7 @@
$(B)/missionpack/game/bg_misc.o \
$(B)/missionpack/game/bg_pmove.o \
$(B)/missionpack/game/bg_slidemove.o \
+ $(B)/missionpack/game/bg_lib.o \
$(B)/missionpack/cgame/cg_consolecmds.o \
$(B)/missionpack/cgame/cg_newdraw.o \
$(B)/missionpack/cgame/cg_draw.o \
@@ -1419,7 +1421,7 @@
$(B)/missionpack/qcommon/q_shared.o
MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
-MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
+MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm)
$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT): $(MPCGOBJ)
$(echo_cmd) "LD $@"
@@ -1447,6 +1449,7 @@
$(B)/baseq3/game/bg_misc.o \
$(B)/baseq3/game/bg_pmove.o \
$(B)/baseq3/game/bg_slidemove.o \
+ $(B)/baseq3/game/bg_lib.o \
$(B)/baseq3/game/g_active.o \
$(B)/baseq3/game/g_arenas.o \
$(B)/baseq3/game/g_bot.o \
@@ -1471,7 +1474,7 @@
$(B)/baseq3/qcommon/q_shared.o
Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
-Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
+Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm)
$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT): $(Q3GOBJ)
$(echo_cmd) "LD $@"
@@ -1497,6 +1500,7 @@
$(B)/missionpack/game/bg_misc.o \
$(B)/missionpack/game/bg_pmove.o \
$(B)/missionpack/game/bg_slidemove.o \
+ $(B)/missionpack/game/bg_lib.o \
$(B)/missionpack/game/g_active.o \
$(B)/missionpack/game/g_arenas.o \
$(B)/missionpack/game/g_bot.o \
@@ -1521,7 +1525,7 @@
$(B)/missionpack/qcommon/q_shared.o
MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
-MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
+MPGVMOBJ = $(MPGOBJ_:%.o=%.asm)
$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT): $(MPGOBJ)
$(echo_cmd) "LD $@"
@@ -1540,6 +1544,7 @@
Q3UIOBJ_ = \
$(B)/baseq3/ui/ui_main.o \
$(B)/baseq3/game/bg_misc.o \
+ $(B)/baseq3/game/bg_lib.o \
$(B)/baseq3/ui/ui_addbots.o \
$(B)/baseq3/ui/ui_atoms.o \
$(B)/baseq3/ui/ui_cdkey.o \
@@ -1583,7 +1588,7 @@
$(B)/baseq3/qcommon/q_shared.o
Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
-Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
+Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
$(B)/baseq3/ui$(ARCH).$(SHLIBEXT): $(Q3UIOBJ)
$(echo_cmd) "LD $@"
@@ -1605,12 +1610,13 @@
$(B)/missionpack/ui/ui_shared.o \
\
$(B)/missionpack/game/bg_misc.o \
+ $(B)/missionpack/game/bg_lib.o \
\
$(B)/missionpack/qcommon/q_math.o \
$(B)/missionpack/qcommon/q_shared.o
MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
-MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
+MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm)
$(B)/missionpack/ui$(ARCH).$(SHLIBEXT): $(MPUIOBJ)
$(echo_cmd) "LD $@"
Modified: trunk/code/client/cl_curl.c
===================================================================
--- trunk/code/client/cl_curl.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/cl_curl.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -20,11 +20,11 @@
===========================================================================
*/
-#if USE_CURL
+#ifdef USE_CURL
#include "client.h"
cvar_t *cl_cURLLib;
-#if USE_CURL_DLOPEN
+#ifdef USE_CURL_DLOPEN
#include "../sys/sys_loadlib.h"
char* (*qcurl_version)(void);
@@ -88,7 +88,7 @@
*/
qboolean CL_cURL_Init()
{
-#if USE_CURL_DLOPEN
+#ifdef USE_CURL_DLOPEN
if(cURLLib)
return qtrue;
@@ -156,7 +156,7 @@
void CL_cURL_Shutdown( void )
{
CL_cURL_Cleanup();
-#if USE_CURL_DLOPEN
+#ifdef USE_CURL_DLOPEN
if(cURLLib)
{
Sys_UnloadLibrary(cURLLib);
Modified: trunk/code/client/cl_curl.h
===================================================================
--- trunk/code/client/cl_curl.h 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/cl_curl.h 2007-09-22 20:32:11 UTC (rev 1186)
@@ -37,14 +37,14 @@
#define DEFAULT_CURL_LIB "libcurl.so.3"
#endif
-#if USE_LOCAL_HEADERS
+#ifdef USE_LOCAL_HEADERS
#include "../libcurl/curl/curl.h"
#else
#include <curl/curl.h>
#endif
-#if USE_CURL_DLOPEN
+#ifdef USE_CURL_DLOPEN
extern char* (*qcurl_version)(void);
extern CURL* (*qcurl_easy_init)(void);
Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/cl_main.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -689,7 +689,7 @@
*/
void CL_ShutdownAll(void) {
-#if USE_CURL
+#ifdef USE_CURL
CL_cURL_Shutdown();
#endif
// clear sounds
@@ -1451,7 +1451,7 @@
*/
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 @@
*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 @@
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 @@
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
Modified: trunk/code/client/client.h
===================================================================
--- trunk/code/client/client.h 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/client.h 2007-09-22 20:32:11 UTC (rev 1186)
@@ -30,7 +30,7 @@
#include "../cgame/cg_public.h"
#include "../game/bg_public.h"
-#if USE_CURL
+#ifdef USE_CURL
#include "cl_curl.h"
#endif /* USE_CURL */
Modified: trunk/code/client/qal.c
===================================================================
--- trunk/code/client/qal.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/qal.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -23,11 +23,11 @@
// Dynamically loads OpenAL
-#if USE_OPENAL
+#ifdef USE_OPENAL
#include "qal.h"
-#if USE_OPENAL_DLOPEN
+#ifdef USE_OPENAL_DLOPEN
#include "../sys/sys_loadlib.h"
Modified: trunk/code/client/qal.h
===================================================================
--- trunk/code/client/qal.h 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/qal.h 2007-09-22 20:32:11 UTC (rev 1186)
@@ -28,12 +28,12 @@
#include "../qcommon/q_shared.h"
#include "../qcommon/qcommon.h"
-#if USE_OPENAL_DLOPEN
+#ifdef USE_OPENAL_DLOPEN
#define AL_NO_PROTOTYPES
#define ALC_NO_PROTOTYPES
#endif
-#if USE_LOCAL_HEADERS
+#ifdef USE_LOCAL_HEADERS
#include "../AL/al.h"
#include "../AL/alc.h"
#else
@@ -47,7 +47,7 @@
#endif
#endif
-#if USE_OPENAL_DLOPEN
+#ifdef USE_OPENAL_DLOPEN
extern LPALENABLE qalEnable;
extern LPALDISABLE qalDisable;
extern LPALISENABLED qalIsEnabled;
Modified: trunk/code/client/snd_codec.c
===================================================================
--- trunk/code/client/snd_codec.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/snd_codec.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -102,7 +102,7 @@
{
codecs = NULL;
S_CodecRegister(&wav_codec);
-#if USE_CODEC_VORBIS
+#ifdef USE_CODEC_VORBIS
S_CodecRegister(&ogg_codec);
#endif
}
Modified: trunk/code/client/snd_codec_ogg.c
===================================================================
--- trunk/code/client/snd_codec_ogg.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/snd_codec_ogg.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -23,7 +23,7 @@
*/
// OGG support is enabled by this define
-#if USE_CODEC_VORBIS
+#ifdef USE_CODEC_VORBIS
// includes for the Q3 sound system
#include "client.h"
Modified: trunk/code/client/snd_openal.c
===================================================================
--- trunk/code/client/snd_openal.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/client/snd_openal.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -25,7 +25,7 @@
#include "snd_codec.h"
#include "client.h"
-#if USE_OPENAL
+#ifdef USE_OPENAL
#include "qal.h"
@@ -1864,7 +1864,7 @@
*/
qboolean S_AL_Init( soundInterface_t *si )
{
-#if USE_OPENAL
+#ifdef USE_OPENAL
qboolean enumsupport, founddev = qfalse;
Modified: trunk/code/game/bg_lib.c
===================================================================
--- trunk/code/game/bg_lib.c 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/game/bg_lib.c 2007-09-22 20:32:11 UTC (rev 1186)
@@ -3,6 +3,8 @@
// bg_lib,c -- standard C library replacement routines used by code
// compiled for the virtual machine
+#ifdef Q3_VM
+
#include "../qcommon/q_shared.h"
/*-
@@ -43,10 +45,6 @@
static const char rcsid[] =
#endif /* LIBC_SCCS and not lint */
-#if !defined( Q3_VM )
-typedef int cmp_t(const void *, const void *);
-#endif
-
static char* med3(char *, char *, char *, cmp_t *);
static void swapfunc(char *, char *, int, int);
@@ -186,10 +184,6 @@
//==================================================================================
-
-// this file is excluded from release builds because of intrinsics
-#if defined ( Q3_VM )
-
size_t strlen( const char *string ) {
const char *s;
@@ -262,9 +256,7 @@
}
return (char *)0;
}
-#endif
-#if defined ( Q3_VM )
int tolower( int c ) {
if ( c >= 'A' && c <= 'Z' ) {
c += 'a' - 'A';
@@ -280,9 +272,6 @@
return c;
}
-#endif
-//#ifndef _MSC_VER
-
void *memmove( void *dest, const void *src, size_t count ) {
int i;
@@ -750,11 +739,9 @@
#endif
-#ifdef Q3_VM
double tan( double x ) {
return sin(x) / cos(x);
}
-#endif
static int randSeed = 0;
@@ -904,7 +891,6 @@
}
-#if defined ( Q3_VM )
int atoi( const char *string ) {
int sign;
int value;
@@ -1248,11 +1234,7 @@
break;
case 'f':
AddFloat( &buf_p, *(double *)arg, width, prec );
-#ifdef Q3_VM
- arg += 1; // everything is 32 bit in my compiler
-#else
- arg += 2;
-#endif
+ arg += 1; // everything is 32 bit
break;
case 's':
AddString( &buf_p, (char *)*arg, width, prec );
Modified: trunk/code/game/bg_lib.h
===================================================================
--- trunk/code/game/bg_lib.h 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/game/bg_lib.h 2007-09-22 20:32:11 UTC (rev 1186)
@@ -23,7 +23,7 @@
// compiled for the virtual machine
// This file is NOT included on native builds
-#ifndef BG_LIB_H
+#if !defined( BG_LIB_H ) && defined( Q3_VM )
#define BG_LIB_H
//Ignore __attribute__ on non-gcc platforms
Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h 2007-09-21 12:33:50 UTC (rev 1185)
+++ trunk/code/qcommon/q_shared.h 2007-09-22 20:32:11 UTC (rev 1186)
@@ -92,11 +92,9 @@
**********************************************************************/
-#ifdef Q3_VM
-
#include "../game/bg_lib.h"
-#else
+#ifndef Q3_VM
#include <assert.h>
#include <math.h>
More information about the quake3-commits
mailing list