use system's zlib

except for libretro
github issue #45

diff --git a/Makefile b/Makefile
index e520669..3b5a714 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -163,10 +163,12 @@ else
 OBJS += platform/common/mp3_dummy.o
 endif
 
-ifneq "$(DONT_COMPILE_IN_ZLIB)" "1"
+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 unzip/unzip_stream.o
 endif

diff --git a/configure b/configure
index 9ccd2da..a25e7c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -241,7 +241,7 @@ check_zlib()
   #include <zlib.h>
   int main(void) { uncompress(0, 0, 0, 0); }
 EOF
-  compile_binary
+  compile_binary "$@"
 }
 
 check_libpng()
@@ -291,8 +291,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)"

diff --git a/pico/cart.c b/pico/cart.c
index b35eb53..9dce38d 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -8,10 +8,9 @@
  */\r
 \r
 #include "pico_int.h"\r
-#include "../zlib/zlib.h"\r
 #include "../cpu/debug.h"\r
 #include "../unzip/unzip.h"\r
-#include "../unzip/unzip_stream.h"\r
+#include <zlib.h>\r
 \r
 \r
 static int rom_alloc_size;\r

diff --git a/pico/state.c b/pico/state.c
index 089957e..88b8655 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -7,7 +7,7 @@
  */\r
 \r
 #include "pico_int.h"\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
 \r
 #include "../cpu/sh2/sh2.h"\r
 #include "sound/ym2612.h"\r

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index d4f6bd4..dd6740a 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -32,7 +32,7 @@
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
 \r
 \r
 #define gizKeyUnkn "???"\r

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 8e682f1..c0bc71f 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -30,7 +30,7 @@
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
 #include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
 \r
 #ifdef BENCHMARK\r
 #define OSD_FPS_X 220\r

diff --git a/platform/psp/menu.c b/platform/psp/menu.c
index 24c6d60..f01f0ae 100644 (file)
--- a/platform/psp/menu.c
+++ b/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 "???"

diff --git a/unzip/unzip.c b/unzip/unzip.c
index ddf59aa..1029165 100644 (file)
--- a/unzip/unzip.c
+++ b/unzip/unzip.c
@@ -5,7 +5,7 @@
 #include <ctype.h>\r
 #include <assert.h>\r
 \r
-#include "zlib/zlib.h"\r
+#include <zlib.h>\r
 \r
 /* public globals */\r
 //int  gUnzipQuiet = 0;                /* flag controls error messages */\r