diff options
| author | Jo Shields <joshield@microsoft.com> | 2019-11-12 11:31:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 11:31:08 +0300 |
| commit | 8bceb40878f3ff21cf3e521d0fe987a8fd6f1326 (patch) | |
| tree | 62f91050858ad1773a42c5f636ddff537f9c4545 /support/minizip | |
| parent | 8683fa6db798298d576c120dd9e1443cd3c5b6de (diff) | |
Move zlib to its own directory, and re-enable subdir-objects
This has the following benefits:
* Clearer structure for mirroring
* Slight build time improvement on bundled zlib use (as it only builds once)
* Removes pages of subdir-objects spew from autogen
Diffstat (limited to 'support/minizip')
| -rw-r--r-- | support/minizip/ioapi.h | 2 | ||||
| -rw-r--r-- | support/minizip/unzip.c | 2 | ||||
| -rw-r--r-- | support/minizip/unzip.h | 2 | ||||
| -rw-r--r-- | support/minizip/zip.c | 2 | ||||
| -rw-r--r-- | support/minizip/zip.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/support/minizip/ioapi.h b/support/minizip/ioapi.h index 37da629d21e..c19178facc3 100644 --- a/support/minizip/ioapi.h +++ b/support/minizip/ioapi.h @@ -43,7 +43,7 @@ #include <stdio.h> #include <stdlib.h> -#include "zlib.h" +#include "../mono/zlib/zlib.h" #if defined(USE_FILE32API) #define fopen64 fopen diff --git a/support/minizip/unzip.c b/support/minizip/unzip.c index bcfb9416ec3..f9e9126bd8b 100644 --- a/support/minizip/unzip.c +++ b/support/minizip/unzip.c @@ -72,7 +72,7 @@ #define NOUNCRYPT #endif -#include "zlib.h" +#include "../mono/zlib/zlib.h" #include "unzip.h" #ifdef STDC diff --git a/support/minizip/unzip.h b/support/minizip/unzip.h index 2104e391507..9c581280a2c 100644 --- a/support/minizip/unzip.h +++ b/support/minizip/unzip.h @@ -48,7 +48,7 @@ extern "C" { #endif #ifndef _ZLIB_H -#include "zlib.h" +#include "../mono/zlib/zlib.h" #endif #ifndef _ZLIBIOAPI_H diff --git a/support/minizip/zip.c b/support/minizip/zip.c index 44e88a9cb98..aa7dc9764ee 100644 --- a/support/minizip/zip.c +++ b/support/minizip/zip.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "zlib.h" +#include "../mono/zlib/zlib.h" #include "zip.h" #ifdef STDC diff --git a/support/minizip/zip.h b/support/minizip/zip.h index 8aaebb62343..f7059099b2a 100644 --- a/support/minizip/zip.h +++ b/support/minizip/zip.h @@ -47,7 +47,7 @@ extern "C" { //#define HAVE_BZIP2 #ifndef _ZLIB_H -#include "zlib.h" +#include "../mono/zlib/zlib.h" #endif #ifndef _ZLIBIOAPI_H |