diff options
| author | vng <viktor.govako@gmail.com> | 2013-01-24 16:40:33 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:49:09 +0300 |
| commit | b0cb1c64ef45ba020f38863f2ad09197612fb164 (patch) | |
| tree | 58336b3cf9961e4906c205389997c87d5c3c1732 /3party | |
| parent | aa95dec76feead45be6ed128372c885cb17c31d5 (diff) | |
Add "zip" to compilation in zlib.
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/zlib/contrib/minizip/zip.c | 2 | ||||
| -rw-r--r-- | 3party/zlib/contrib/minizip/zip.h | 2 | ||||
| -rw-r--r-- | 3party/zlib/zlib.pro | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/3party/zlib/contrib/minizip/zip.c b/3party/zlib/contrib/minizip/zip.c index 3c34fc8bd4..4eebdcdd99 100644 --- a/3party/zlib/contrib/minizip/zip.c +++ b/3party/zlib/contrib/minizip/zip.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "zlib.h" + #include "zip.h" #ifdef STDC diff --git a/3party/zlib/contrib/minizip/zip.h b/3party/zlib/contrib/minizip/zip.h index 8aaebb6234..1664dc08d4 100644 --- a/3party/zlib/contrib/minizip/zip.h +++ b/3party/zlib/contrib/minizip/zip.h @@ -47,7 +47,7 @@ extern "C" { //#define HAVE_BZIP2 #ifndef _ZLIB_H -#include "zlib.h" +#include "../../zlib.h" #endif #ifndef _ZLIBIOAPI_H diff --git a/3party/zlib/zlib.pro b/3party/zlib/zlib.pro index ee33747388..bcd8ad5b0b 100644 --- a/3party/zlib/zlib.pro +++ b/3party/zlib/zlib.pro @@ -30,6 +30,7 @@ SOURCES += \ zutil.c \ contrib/minizip/unzip.c \ contrib/minizip/ioapi.c \ + contrib/minizip/zip.c \ HEADERS += \ crc32.h \ @@ -45,3 +46,4 @@ HEADERS += \ zutil.h \ contrib/minizip/unzip.h \ contrib/minizip/ioapi.h \ + contrib/minizip/zip.h \ |