Move miniz into a subdirectory.

An upcoming update will add several files, having miniz in it's own
subdirectory makes it clear what belongs to it an whit to unzip.

CMakeLists.txt

@@ -461,8 +461,8 @@ set(Client-Source
 	${COMMON_SRC_DIR}/shared/rand.c
 	${COMMON_SRC_DIR}/shared/shared.c
 	${COMMON_SRC_DIR}/unzip/ioapi.c
-	${COMMON_SRC_DIR}/unzip/miniz.c
 	${COMMON_SRC_DIR}/unzip/unzip.c
+	${COMMON_SRC_DIR}/unzip/miniz/miniz.c
 	${SERVER_SRC_DIR}/sv_cmd.c
 	${SERVER_SRC_DIR}/sv_conless.c
 	${SERVER_SRC_DIR}/sv_entities.c
@@ -499,9 +499,9 @@ set(Client-Header
 	${COMMON_SRC_DIR}/header/shared.h
 	${COMMON_SRC_DIR}/header/zone.h
 	${COMMON_SRC_DIR}/unzip/ioapi.h
-	${COMMON_SRC_DIR}/unzip/miniz.h
-	${COMMON_SRC_DIR}/unzip/minizconf.h
 	${COMMON_SRC_DIR}/unzip/unzip.h
+	${COMMON_SRC_DIR}/unzip/miniz/miniz.h
+	${COMMON_SRC_DIR}/unzip/miniz/minizconf.h
 	${SERVER_SRC_DIR}/header/server.h
 	)
 
@@ -524,8 +524,8 @@ set(Server-Source
 	${COMMON_SRC_DIR}/shared/rand.c
 	${COMMON_SRC_DIR}/shared/shared.c
 	${COMMON_SRC_DIR}/unzip/ioapi.c
-	${COMMON_SRC_DIR}/unzip/miniz.c
 	${COMMON_SRC_DIR}/unzip/unzip.c
+	${COMMON_SRC_DIR}/unzip/miniz/miniz.c
 	${SERVER_SRC_DIR}/sv_cmd.c
 	${SERVER_SRC_DIR}/sv_conless.c
 	${SERVER_SRC_DIR}/sv_entities.c
@@ -546,9 +546,9 @@ set(Server-Header
 	${COMMON_SRC_DIR}/header/shared.h
 	${COMMON_SRC_DIR}/header/zone.h
 	${COMMON_SRC_DIR}/unzip/ioapi.h
-	${COMMON_SRC_DIR}/unzip/miniz.h
-	${COMMON_SRC_DIR}/unzip/minizconf.h
 	${COMMON_SRC_DIR}/unzip/unzip.h
+	${COMMON_SRC_DIR}/unzip/miniz/miniz.h
+	${COMMON_SRC_DIR}/unzip/miniz/minizconf.h
 	${SERVER_SRC_DIR}/header/server.h
 	)
 

Makefile

@@ -883,8 +883,8 @@ CLIENT_OBJS_ := \
 	src/common/shared/rand.o \
 	src/common/shared/shared.o \
 	src/common/unzip/ioapi.o \
-	src/common/unzip/miniz.o \
 	src/common/unzip/unzip.o \
+	src/common/unzip/miniz/miniz.o \
 	src/server/sv_cmd.o \
 	src/server/sv_conless.o \
 	src/server/sv_entities.o \
@@ -1042,8 +1042,8 @@ SERVER_OBJS_ := \
 	src/common/shared/rand.o \
 	src/common/shared/shared.o \
 	src/common/unzip/ioapi.o \
-	src/common/unzip/miniz.o \
 	src/common/unzip/unzip.o \
+	src/common/unzip/miniz/miniz.o \
 	src/server/sv_cmd.o \
 	src/server/sv_conless.o \
 	src/server/sv_entities.o \

src/client/vid/vid.c

@@ -35,7 +35,7 @@
 // Screenshots
 // -----------
 
-#include "../../common/unzip/miniz.h"
+#include "../../common/unzip/miniz/miniz.h"
 
 static unsigned char*
 compress_for_stbiw(unsigned char *data, int data_len, int *out_len, int quality)

src/common/unzip/ioapi.h

@@ -43,8 +43,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "miniz.h"
-#include "minizconf.h"
+#include "miniz/miniz.h"
+#include "miniz/minizconf.h"
 
 #if defined(USE_FILE32API)
 #define fopen64 fopen

src/common/unzip/unzip.c

@@ -72,8 +72,8 @@
         #define NOUNCRYPT
 #endif
 
-#include "miniz.h"
-#include "minizconf.h"
+#include "miniz/miniz.h"
+#include "miniz/minizconf.h"
 #include "unzip.h"
 
 #ifdef STDC

src/common/unzip/unzip.h

@@ -47,8 +47,8 @@
 extern "C" {
 #endif
 
-#include "miniz.h"
-#include "minizconf.h"
+#include "miniz/miniz.h"
+#include "miniz/minizconf.h"
 
 #ifndef  _ZLIBIOAPI_H
 #include "ioapi.h"