use system's zlib

except for libretro
github issue #45

Makefile

@@ -164,9 +164,12 @@ else
 OBJS += platform/common/mp3_dummy.o
 endif
 
+ifeq "$(PLATFORM)" "libretro"
 # zlib
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
+CFLAGS += -Izlib
+endif
 # unzip
 OBJS += unzip/unzip.o
 

configure

@@ -258,7 +258,7 @@ check_zlib()
   #include <zlib.h>
   int main(void) { uncompress(0, 0, 0, 0); }
 EOF
-  compile_binary
+  compile_binary "$@"
 }
 
 check_libpng()
@@ -308,8 +308,8 @@ EOF
   compile_object "$@"
 }
 
-#MAIN_LDLIBS="$MAIN_LDLIBS -lz"
-#check_zlib || fail "please install zlib (libz-dev)"
+MAIN_LDLIBS="$MAIN_LDLIBS -lz"
+check_zlib -lz || fail "please install zlib (libz-dev)"
 
 MAIN_LDLIBS="-lpng $MAIN_LDLIBS"
 check_libpng || fail "please install libpng (libpng-dev)"

pico/cart.c

@@ -8,9 +8,9 @@
  */
 
 #include "pico_int.h"
-#include "../zlib/zlib.h"
 #include "../cpu/debug.h"
 #include "../unzip/unzip.h"
+#include <zlib.h>
 
 
 static int rom_alloc_size;

pico/state.c

@@ -7,7 +7,7 @@
  */
 
 #include "pico_int.h"
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 #include "../cpu/sh2/sh2.h"
 #include "sound/ym2612.h"

platform/gizmondo/menu.c

@@ -32,7 +32,7 @@
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 
 #define gizKeyUnkn "???"

platform/gp2x/emu.c

@@ -30,7 +30,7 @@
 #include <pico/pico_int.h>
 #include <pico/patch.h>
 #include <pico/sound/mix.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220

platform/psp/menu.c

@@ -33,7 +33,7 @@
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 
 #define pspKeyUnkn "???"

unzip/unzip.c

@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "zlib/zlib.h"
+#include <zlib.h>
 
 /* public globals */
 //int	gUnzipQuiet = 0;		/* flag controls error messages */