diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | code/qcommon/unzip.c | 1 | ||||
| -rw-r--r-- | code/qcommon/unzip.h | 13 |
3 files changed, 7 insertions, 10 deletions
@@ -879,6 +879,9 @@ endif ifeq ($(USE_INTERNAL_ZLIB),1) BASE_CFLAGS += -DNO_GZIP + ifneq ($(USE_LOCAL_HEADERS),1) + BASE_CFLAGS += -I$(ZDIR) + endif else LIBS += -lz endif diff --git a/code/qcommon/unzip.c b/code/qcommon/unzip.c index a50e186..d0b3d2a 100644 --- a/code/qcommon/unzip.c +++ b/code/qcommon/unzip.c @@ -38,7 +38,6 @@ woven in by Terry Thorsen 1/2003. #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "zlib.h" #include "unzip.h" #ifdef STDC diff --git a/code/qcommon/unzip.h b/code/qcommon/unzip.h index bac8695..b4a839b 100644 --- a/code/qcommon/unzip.h +++ b/code/qcommon/unzip.h @@ -49,17 +49,12 @@ extern "C" { #endif -#ifndef _ZLIB_H - #ifdef USE_LOCAL_HEADERS - #include "../zlib/zlib.h" - #else - #include <zlib.h> - #endif +#ifdef USE_LOCAL_HEADERS + #include "../zlib/zlib.h" +#else + #include <zlib.h> #endif - -#ifndef _ZLIBIOAPI_H #include "ioapi.h" -#endif #define NOUNCRYPT |