From 030a5eee08fdd12bcec0b603db84ae651e46d915 Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Wed, 1 Sep 2010 08:58:58 +0000
Subject: [PATCH] Verschiebe unzip nach common

---
 Makefile                       | 41 ++++++++++++++++++----------------
 src/common/filesystem.c        |  2 +-
 src/{ => common}/unzip/crypt.h |  0
 src/{ => common}/unzip/ioapi.c |  0
 src/{ => common}/unzip/ioapi.h |  0
 src/{ => common}/unzip/unzip.c |  0
 src/{ => common}/unzip/unzip.h |  0
 7 files changed, 23 insertions(+), 20 deletions(-)
 rename src/{ => common}/unzip/crypt.h (100%)
 rename src/{ => common}/unzip/ioapi.c (100%)
 rename src/{ => common}/unzip/ioapi.h (100%)
 rename src/{ => common}/unzip/unzip.c (100%)
 rename src/{ => common}/unzip/unzip.h (100%)

diff --git a/Makefile b/Makefile
index 84ab46e0..cf2d5630 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ client:
 		build/common/common \
 		build/common/message \
 		build/common/model \
+		build/common/unzip \
 		build/gameabi \
 		build/posix \
 		build/posix/glob \
@@ -140,6 +141,7 @@ dedicated_server:
 		build/dedicated_server_common/common \
 		build/dedicated_server_common/message \
 		build/dedicated_server_common/model \
+		build/dedicated_server_common/unzip \
 		build/dedicated_server_posix \
 		build/dedicated_server_posix/glob \
 		release
@@ -223,13 +225,9 @@ COMMON_OBJS = \
 	build/common/model/cm_box.o \
 	build/common/model/cm_boxtracing.o \
 	build/common/model/cm_bsp.o \
-	build/common/model/cm_vis.o
-# ----------
-
-# Unzip Object
-UNZIP_OBJ = \
-	build/unzip/ioapi.o \
-	build/unzip/unzip.o
+	build/common/model/cm_vis.o \
+	build/common/unzip/ioapi.o \
+	build/common/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_boxtracing.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
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $<    
-
-# ----------
-
-build/unzip/ioapi.o :   	   		src/unzip/ioapi.c
+ 
+build/common/unzip/ioapi.o :   	   		src/common/unzip/ioapi.c
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
 
-build/unzip/unzip.o :	      		src/unzip/unzip.c
-	$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
+build/common/unzip/unzip.o :	      	src/common/unzip/unzip.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
 	$(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
@@ -1037,16 +1040,16 @@ build/ctf/q_shared.o:  				src/game/ctf/q_shared.c
   
 #  The client
 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) \
-		$(SERVER_OBJS) $(POSIX_OBJS) $(SDL_OBJS) $(UNZIP_OBJ) $(LDFLAGS) \
+		$(SERVER_OBJS) $(POSIX_OBJS) $(SDL_OBJS) $(LDFLAGS) \
 		$(SDLLDFLAGS) $(OGGLDFLAGS) $(ZLIBLDFLAGS)
 
 # Dedicated Server
 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) \
-		$(DEDICATED_SERVER_COMMON_OBJS) $(GAME_ABI_OBJS) $(UNZIP_OBJ)\
+		$(DEDICATED_SERVER_COMMON_OBJS) $(GAME_ABI_OBJS) \
 		$(DEDICATED_SERVER_POSIX_OBJS) $(LDFLAGS) $(ZLIBLDFLAGS)
 
 # OpenGL refresher
diff --git a/src/common/filesystem.c b/src/common/filesystem.c
index ba21f836..e4919c0c 100644
--- a/src/common/filesystem.c
+++ b/src/common/filesystem.c
@@ -27,7 +27,7 @@
 
 #include "header/common.h"
 #include "../posix/glob/glob.h"
-#include "../unzip/unzip.h"
+#include "unzip/unzip.h"
 
 #define MAX_HANDLES		512
 #define MAX_READ		0x10000
diff --git a/src/unzip/crypt.h b/src/common/unzip/crypt.h
similarity index 100%
rename from src/unzip/crypt.h
rename to src/common/unzip/crypt.h
diff --git a/src/unzip/ioapi.c b/src/common/unzip/ioapi.c
similarity index 100%
rename from src/unzip/ioapi.c
rename to src/common/unzip/ioapi.c
diff --git a/src/unzip/ioapi.h b/src/common/unzip/ioapi.h
similarity index 100%
rename from src/unzip/ioapi.h
rename to src/common/unzip/ioapi.h
diff --git a/src/unzip/unzip.c b/src/common/unzip/unzip.c
similarity index 100%
rename from src/unzip/unzip.c
rename to src/common/unzip/unzip.c
diff --git a/src/unzip/unzip.h b/src/common/unzip/unzip.h
similarity index 100%
rename from src/unzip/unzip.h
rename to src/common/unzip/unzip.h