yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 15:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Damit ist - bis auf einen Testlauf - das Aufräumen

Browse source 
des Clients und Server für POSIX beendet
This commit is contained in:
Yamagi Burmeister 2009-03-04 16:24:55 +00:00
parent 7784426a43
commit 675192bd21
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Makefile
View file

@ -92,7 +92,7 @@ SDLLDFLAGS=$(shell sdl-config --libs)
# Targets # Targets
all: client all: client dedicated_server
client: client:
@-mkdir -p build \ @-mkdir -p build \
@ -107,18 +107,21 @@ client:
build/posix/glob \ build/posix/glob \
build/posix/sdl \ build/posix/sdl \
build/posix/vid \ build/posix/vid \
build/server build/server \
$(MAKE) build/client/quake2 release
$(MAKE) release/quake2
dedicated_server: dedicated_server:
@-mkdir -p build \ @-mkdir -p build \
build/dedicated_server \ build/dedicated_server \
build/dedicated_server_common \ build/dedicated_server_common \
build/dedicated_server_posix build/dedicated_server_posix \
$(MAKE) build/dedicated_server/q2ded build/dedicated_server_posix/glob \
release
$(MAKE) release/q2ded
clean: clean:
@-rm -Rf build @-rm -Rf build release
# ---------- # ----------
@ -222,10 +225,10 @@ DEDICATED_SERVER_COMMON_OBJS = \
# Dedicated server POSIX platform objects # Dedicated server POSIX platform objects
DEDICATED_SERVER_POSIX_OBJS = \ DEDICATED_SERVER_POSIX_OBJS = \
build/dedicated_server_posix/glob.o \ build/dedicated_server_posix/glob/glob.o \
build/dedicated_server_posix/net_udp.o \ build/dedicated_server_posix/network.o \
build/dedicated_server_posix/posix.o \ build/dedicated_server_posix/posix.o \
build/dedicated_server_posix/sys_linux.o build/dedicated_server_posix/system.o
# ---------- # ----------
@ -440,28 +443,28 @@ build/dedicated_server_common/pmove.o : src/common/pmove.c
# ---------- # ----------
# Dedicated server POSIX build # Dedicated server POSIX build
build/dedicated_server_posix/glob.o : src/platforms/posix/glob.c build/dedicated_server_posix/glob/glob.o : src/platforms/posix/glob/glob.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/net_udp.o : src/platforms/posix/net_udp.c build/dedicated_server_posix/network.o : src/platforms/posix/network.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/q_shlinux.o : src/platforms/posix/q_shlinux.c build/dedicated_server_posix/posix.o : src/platforms/posix/posix.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/sys_linux.o : src/platforms/posix/sys_linux.c build/dedicated_server_posix/system.o : src/platforms/posix/system.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
# ---------- # ----------
# The client # The client
build/client/quake2 : $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \ release/quake2 : $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \
$(SERVER_OBJS) $(POSIX_OBJS) $(SERVER_OBJS) $(POSIX_OBJS)
$(CC) $(CFLAGS_CLIENT) -o $@ $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \ $(CC) $(CFLAGS_CLIENT) -o $@ $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \
$(SERVER_OBJS) $(POSIX_OBJS) $(LDFLAGS) $(SDLLDFLAGS) $(SERVER_OBJS) $(POSIX_OBJS) $(LDFLAGS) $(SDLLDFLAGS)
# Dedicated Server # Dedicated Server
build/dedicated_server/q2ded : $(DEDICATED_SERVER_OBJS) $(DEDICATED_SERVER_COMMON_OBJS) \ release/q2ded : $(DEDICATED_SERVER_OBJS) $(DEDICATED_SERVER_COMMON_OBJS) \
$(GAME_ABI_OBJS) $(DEDICATED_SERVER_POSIX_OBJS) $(GAME_ABI_OBJS) $(DEDICATED_SERVER_POSIX_OBJS)
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ $(DEDICATED_SERVER_OBJS) \ $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ $(DEDICATED_SERVER_OBJS) \
$(DEDICATED_SERVER_COMMON_OBJS) $(GAME_ABI_OBJS) \ $(DEDICATED_SERVER_COMMON_OBJS) $(GAME_ABI_OBJS) \

4
src/platforms/posix/system.c
View file

@ -84,7 +84,9 @@ void Sys_Printf (char *fmt, ...)
void Sys_Quit (void) void Sys_Quit (void)
{ {
#ifndef DEDICATED_ONLY
CL_Shutdown (); CL_Shutdown ();
#endif
Qcommon_Shutdown (); Qcommon_Shutdown ();
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
_exit(0); _exit(0);
@ -102,7 +104,9 @@ void Sys_Error (char *error, ...)
// change stdin to non blocking // change stdin to non blocking
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#ifndef DEDICATED_ONLY
CL_Shutdown (); CL_Shutdown ();
#endif
Qcommon_Shutdown (); Qcommon_Shutdown ();
va_start (argptr,error); va_start (argptr,error);