Create compat versions of zlib.h and zutil.h

deps/zlib/adler32.c

@@ -8,7 +8,7 @@
 #define ZLIB_INTERNAL
 #include <stdint.h>
 #include <stddef.h>
-#include "zutil.h"
+#include <compat/zutil.h>
 
 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552

deps/zlib/compress.c

@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <compat/zlib.h>
 
 /* ===========================================================================
    Compresses the source buffer into the destination buffer. The level

deps/zlib/deflate.h

@@ -13,7 +13,7 @@
 #ifndef DEFLATE_H
 #define DEFLATE_H
 
-#include "zutil.h"
+#include <compat/zutil.h>
 
 /* define NO_GZIP when compiling if you want to disable gzip header and
    trailer creation by deflate().  NO_GZIP would be used to avoid linking in

deps/zlib/gzguts.h

@@ -22,7 +22,7 @@
 #endif
 
 #include <stdio.h>
-#include "zlib.h"
+#include <compat/zlib.h>
 #ifdef STDC
 #  include <string.h>
 #  include <stdlib.h>

deps/zlib/infback.c

@@ -10,7 +10,7 @@
    inflate_fast() can be used with either inflate.c or infback.c.
    */
 
-#include "zutil.h"
+#include <compat/zutil.h>
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"

deps/zlib/inffast.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "zutil.h"
+#include <compat/zutil.h>
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"

deps/zlib/inflate.c

@@ -80,7 +80,7 @@
    * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
    */
 
-#include "zutil.h"
+#include <compat/zutil.h>
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"

deps/zlib/inftrees.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "zutil.h"
+#include <compat/zutil.h>
 #include "inftrees.h"
 
 #define MAXBITS 15

deps/zlib/ioapi.h

@@ -42,7 +42,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "zlib.h"
+#include <compat/zlib.h>
 
 #if defined(USE_FILE32API)
 #define fopen64 fopen

deps/zlib/uncompr.c

@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <compat/zlib.h>
 
 /* ===========================================================================
    Decompresses the source buffer into the destination buffer.  sourceLen is

deps/zlib/unzip.c

@@ -72,7 +72,7 @@
 #define NOUNCRYPT
 #endif
 
-#include "zlib.h"
+#include <compat/zlib.h>
 #include "unzip.h"
 
 #ifdef STDC

deps/zlib/unzip.h

@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <compat/zlib.h>
 #endif
 
 #ifndef  _ZLIBIOAPI_H

deps/zlib/zutil.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zutil.h"
+#include <compat/zutil.h>
 #ifndef Z_SOLO
 #  include "gzguts.h"
 #endif

libretro-common/file/file_extract.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zlib.h>
+#include <compat/zlib.h>
 
 /* File backends. Can be fleshed out later, but keep it simple for now.
  * The file is mapped to memory directly (via mmap() or just 

libretro-common/include/compat/zlib.h

@@ -1,3 +1,8 @@
+#ifndef _COMPAT_ZLIB_H
+#define _COMPAT_ZLIB_H
+
+#ifdef WANT_ZLIB
+
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.8, April 28th, 2013
 
@@ -1761,3 +1766,9 @@ ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
 #endif
 
 #endif /* ZLIB_H */
+
+#else
+#include <zlib.h>
+#endif
+
+#endif

libretro-common/include/compat/zutil.h

@@ -1,3 +1,8 @@
+#ifndef _COMPAT_ZUTIL_H
+#define _COMPAT_ZUTIL_H
+
+#ifdef WANT_ZLIB
+
 /* zutil.h -- internal interface and configuration of the compression library
  * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -19,7 +24,7 @@
 #  define ZLIB_INTERNAL
 #endif
 
-#include "zlib.h"
+#include <compat/zlib.h>
 
 #if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
@@ -251,3 +256,9 @@ extern char * const z_errmsg[10]; /* indexed by 2-zlib_error */
                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
 
 #endif /* ZUTIL_H */
+
+#else
+#include <zutil.h>
+#endif
+
+#endif

libretro-common/utils/crc32.c

@@ -1,10 +1,11 @@
 /* gcc -O3 -o crc32 crc32.c -lz */
 
 #include <stdio.h>
-#include <zlib.h>
 #include <errno.h>
 #include <string.h>
 
+#include <compat/zlib.h>
+
 int main(int argc, const char* argv[])
 {
    if (argc != 2 )