fix zlib includes

This commit is contained in:
Ludwig Nussel 2009-10-24 14:19:39 +00:00
parent c312449422
commit 2fc4023e0b
3 changed files with 7 additions and 10 deletions

View file

@ -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

View file

@ -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

View file

@ -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