fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Those haven't been needed in a long time, and small fix for my last commit.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3657 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2010-11-15 02:45:59 +00:00
parent da09f7ba44
commit 1cf4aed554
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
engine/Makefile
View file

@ -243,7 +243,7 @@ ifeq ($(FTE_TARGET),vc)
WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
GNUC_FUNCS= GNUC_FUNCS=
else else
WARNINGFLAGS=-Wall WARNINGFLAGS=-Wall -Wno-pointer-sign
GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -D_vsnprintf=vsnprintf -D_snprintf=snprintf GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -D_vsnprintf=vsnprintf -D_snprintf=snprintf
endif endif
@ -423,13 +423,6 @@ SERVER_OBJS = \
svq2_ents.o \ svq2_ents.o \
svq2_game.o \ svq2_game.o \
svq3_game.o \ svq3_game.o \
snd_vc.o \
snd_voicecodecs.o \
g711.o \
g721.o \
g723_24.o \
g723_40.o \
g72x.o \
webgen.o \ webgen.o \
ftpserver.o \ ftpserver.o \
httpserver.o httpserver.o
@ -686,13 +679,13 @@ ifneq ($(shell echo $(FTE_TARGET)|grep linux),)
SV_LDFLAGS=-lz SV_LDFLAGS=-lz
SV_EXE_NAME=../fteqw.sv$(BITS) SV_EXE_NAME=../fteqw.sv$(BITS)
GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o snd_linux.o snd_alsa.oo cd_linux.o sys_linux.o GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o snd_sdl.o snd_alsa.oo cd_linux.o sys_linux.o
ifeq ($(USEASM),true) ifeq ($(USEASM),true)
GLCL_OBJS+= sys_dosa.o GLCL_OBJS+= sys_dosa.o
endif endif
GL_EXE_NAME=../fteqw.gl$(BITS) GL_EXE_NAME=../fteqw.gl$(BITS)
GLCL_EXE_NAME=../fteqwcl.gl$(BITS) GLCL_EXE_NAME=../fteqwcl.gl$(BITS)
GL_LDFLAGS=$(GLLDFLAGS) $(GLXLDFLAGS) -lXxf86vm -lXxf86dga GL_LDFLAGS=$(GLLDFLAGS) $(GLXLDFLAGS) -lXxf86vm -lXxf86dga -lSDL
GL_CFLAGS=$(GLCFLAGS) -I/usr/X11R6/include -DUSE_DGA GL_CFLAGS=$(GLCFLAGS) -I/usr/X11R6/include -DUSE_DGA
GLB_DIR=gl_linux$(BITS) GLB_DIR=gl_linux$(BITS)
GLCL_DIR=glcl_linux$(BITS) GLCL_DIR=glcl_linux$(BITS)

2
engine/server/svq3_game.c
View file

@ -8,7 +8,7 @@ float RadiusFromBounds (vec3_t mins, vec3_t maxs);
#define USEBOTLIB #define USEBOTLIB
#define BOTLIB_STATIC //#define BOTLIB_STATIC
#ifdef USEBOTLIB #ifdef USEBOTLIB