From 0ceaef027f74e4c02bc34da1ff2d207f8fad0d62 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 26 Sep 2004 03:46:49 +0000 Subject: [PATCH] Fixed compilation under linux, compleatly and utterly. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@251 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile.Linux | 2 +- engine/client/teamplay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/Makefile.Linux b/engine/Makefile.Linux index e6cb09322..c6206eab7 100644 --- a/engine/Makefile.Linux +++ b/engine/Makefile.Linux @@ -26,7 +26,7 @@ XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lpng -ljpeg SLDFLAGS=-lvga -BASE_CFLAGS=-Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(QUX_DIR) -I/usr/X11R6/include -D_vsnprintf=vsnprintf -D_snprintf=snprintf +BASE_CFLAGS=-Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(QUX_DIR) -I/usr/X11R6/include -D_vsnprintf=vsnprintf -D_snprintf=snprintf CLIENT_ONLY_CFLAGS=$(BASE_CFLAGS) -DCLIENTONLY SERVER_ONLY_CFLAGS=$(BASE_CFLAGS) -DSERVERONLY JOINT_CFLAGS=$(BASE_CFLAGS) diff --git a/engine/client/teamplay.c b/engine/client/teamplay.c index 9843a235f..c8d06d924 100644 --- a/engine/client/teamplay.c +++ b/engine/client/teamplay.c @@ -13,7 +13,7 @@ #include "quakedef.h" -#ifndef ZQUAKETEAMPLAY +#if 0 //ndef ZQUAKETEAMPLAY cvar_t tp_name_armortype_ga = {"tp_name_armortype_ga", "g"}; cvar_t tp_name_armortype_ya = {"tp_name_armortype_ya", "y"};