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

Verschiebe unzip nach common

Browse source
This commit is contained in:
Yamagi Burmeister 2010-09-01 08:58:58 +00:00
parent c2e06a2682
commit 030a5eee08
7 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Makefile
View file

@ -122,6 +122,7 @@ client:
build/common/common \ build/common/common \
build/common/message \ build/common/message \
build/common/model \ build/common/model \
build/common/unzip \
build/gameabi \ build/gameabi \
build/posix \ build/posix \
build/posix/glob \ build/posix/glob \
@ -140,6 +141,7 @@ dedicated_server:
build/dedicated_server_common/common \ build/dedicated_server_common/common \
build/dedicated_server_common/message \ build/dedicated_server_common/message \
build/dedicated_server_common/model \ build/dedicated_server_common/model \
build/dedicated_server_common/unzip \
build/dedicated_server_posix \ build/dedicated_server_posix \
build/dedicated_server_posix/glob \ build/dedicated_server_posix/glob \
release release
@ -223,13 +225,9 @@ COMMON_OBJS = \
build/common/model/cm_box.o \ build/common/model/cm_box.o \
build/common/model/cm_boxtracing.o \ build/common/model/cm_boxtracing.o \
build/common/model/cm_bsp.o \ build/common/model/cm_bsp.o \
build/common/model/cm_vis.o build/common/model/cm_vis.o \
# ---------- build/common/unzip/ioapi.o \
build/common/unzip/unzip.o
# Unzip Object
UNZIP_OBJ = \
build/unzip/ioapi.o \
build/unzip/unzip.o
# ---------- # ----------
@ -306,7 +304,9 @@ DEDICATED_SERVER_COMMON_OBJS = \
build/dedicated_server_common/model/cm_box.o \ build/dedicated_server_common/model/cm_box.o \
build/dedicated_server_common/model/cm_boxtracing.o \ build/dedicated_server_common/model/cm_boxtracing.o \
build/dedicated_server_common/model/cm_bsp.o \ build/dedicated_server_common/model/cm_bsp.o \
build/dedicated_server_common/model/cm_vis.o build/dedicated_server_common/model/cm_vis.o \
build/dedicated_server_common/unzip/ioapi.o \
build/dedicated_server_common/unzip/unzip.o
# ---------- # ----------
@ -571,14 +571,12 @@ build/common/model/cm_bsp.o : src/common/model/cm_bsp.c
build/common/model/cm_vis.o : src/common/model/cm_vis.c build/common/model/cm_vis.o : src/common/model/cm_vis.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(CC) $(CFLAGS_CLIENT) -o $@ -c $<
# ---------- build/common/unzip/ioapi.o : src/common/unzip/ioapi.c
build/unzip/ioapi.o : src/unzip/ioapi.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/unzip/unzip.o : src/unzip/unzip.c build/common/unzip/unzip.o : src/common/unzip/unzip.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(CC) $(CFLAGS_CLIENT) -o $@ -c $<
# ---------- # ----------
@ -737,7 +735,12 @@ build/dedicated_server_common/model/cm_bsp.o : src/common/model/cm_bsp.c
build/dedicated_server_common/model/cm_vis.o : src/common/model/cm_vis.c build/dedicated_server_common/model/cm_vis.o : src/common/model/cm_vis.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_common/unzip/ioapi.o : src/common/unzip/ioapi.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/dedicated_server_common/unzip/unzip.o : src/common/unzip/unzip.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
# ---------- # ----------
# Dedicated server POSIX build # Dedicated server POSIX build
@ -1037,16 +1040,16 @@ build/ctf/q_shared.o: src/game/ctf/q_shared.c
# The client # The client
release/quake2 : $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \ release/quake2 : $(CLIENT_OBJS) $(COMMON_OBJS) $(GAME_ABI_OBJS) \
$(UNZIP_OBJ) $(SERVER_OBJS) $(POSIX_OBJS) $(SDL_OBJS) $(SERVER_OBJS) $(POSIX_OBJS) $(SDL_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) $(SDL_OBJS) $(UNZIP_OBJ) $(LDFLAGS) \ $(SERVER_OBJS) $(POSIX_OBJS) $(SDL_OBJS) $(LDFLAGS) \
$(SDLLDFLAGS) $(OGGLDFLAGS) $(ZLIBLDFLAGS) $(SDLLDFLAGS) $(OGGLDFLAGS) $(ZLIBLDFLAGS)
# Dedicated Server # Dedicated Server
release/q2ded : $(DEDICATED_SERVER_OBJS) $(DEDICATED_SERVER_COMMON_OBJS) \ release/q2ded : $(DEDICATED_SERVER_OBJS) $(DEDICATED_SERVER_COMMON_OBJS) \
$(GAME_ABI_OBJS) $(DEDICATED_SERVER_POSIX_OBJS) $(UNZIP_OBJ) $(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) $(UNZIP_OBJ)\ $(DEDICATED_SERVER_COMMON_OBJS) $(GAME_ABI_OBJS) \
$(DEDICATED_SERVER_POSIX_OBJS) $(LDFLAGS) $(ZLIBLDFLAGS) $(DEDICATED_SERVER_POSIX_OBJS) $(LDFLAGS) $(ZLIBLDFLAGS)
# OpenGL refresher # OpenGL refresher

2
src/common/filesystem.c
View file

@ -27,7 +27,7 @@
#include "header/common.h" #include "header/common.h"
#include "../posix/glob/glob.h" #include "../posix/glob/glob.h"
#include "../unzip/unzip.h" #include "unzip/unzip.h"
#define MAX_HANDLES 512 #define MAX_HANDLES 512
#define MAX_READ 0x10000 #define MAX_READ 0x10000

0
src/unzip/crypt.h → src/common/unzip/crypt.h
View file

0
src/unzip/ioapi.c → src/common/unzip/ioapi.c
View file

0
src/unzip/ioapi.h → src/common/unzip/ioapi.h
View file

0
src/unzip/unzip.c → src/common/unzip/unzip.c
View file

0
src/unzip/unzip.h → src/common/unzip/unzip.h
View file