diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-24 14:19:39 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-24 14:19:39 +0000 |
| commit | 23f67fcd09eb5199fd6e6a1932ea6e0d7326a40e (patch) | |
| tree | 7674445050b778b37517d02bf0a64f17bf5db38b | |
| parent | 5bd4b0624727137657029b47bf3d1e33ee22c1a4 (diff) | |
| download | ioquake3-aero-23f67fcd09eb5199fd6e6a1932ea6e0d7326a40e.tar.gz ioquake3-aero-23f67fcd09eb5199fd6e6a1932ea6e0d7326a40e.zip | |
fix zlib includes
git-svn-id: svn://svn.icculus.org/quake3/trunk@1702 edf5b092-35ff-0310-97b2-ce42778d08ea
| -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 |