(PS3) We shouldn't compile in zlib code in a core period -

compile out zlib parts with NO_ZLIB ifdef for PSP and PS3

diff --git a/Makefile b/Makefile
index 633f0bc..f18d26e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -157,8 +157,8 @@ ifneq "$(DONT_COMPILE_IN_ZLIB)" "1"
 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
 # unzip
-endif
 OBJS += unzip/unzip.o unzip/unzip_stream.o
+endif
 
 
 include platform/common/common.mak

diff --git a/Makefile.libretro b/Makefile.libretro
index 128e5f3..4818219 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -193,6 +193,10 @@ else
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
 endif
 
+ifeq ($(DONT_COMPILE_IN_ZLIB),1)
+CFLAGS += -DNO_ZLIB
+endif
+
 ifeq ($(NO_MMAP),1)
 CFLAGS += -DNO_MMAP
 endif

diff --git a/pico/cart.c b/pico/cart.c
index a5c563d..d237fad 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -100,6 +100,7 @@ pm_file *pm_open(const char *path)
     return NULL;\r
 \r
   ext = get_ext(path);\r
+#ifndef NO_ZLIB\r
   if (strcasecmp(ext, "zip") == 0)\r
   {\r
     struct zipent *zipentry;\r
@@ -149,7 +150,9 @@ zip_failed:
       return NULL;\r
     }\r
   }\r
-  else if (strcasecmp(ext, "cso") == 0)\r
+  else\r
+#endif\r
+  if (strcasecmp(ext, "cso") == 0)\r
   {\r
     cso_struct *cso = NULL, *tmp = NULL;\r
     int size;\r
@@ -244,6 +247,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
   {\r
     ret = fread(ptr, 1, bytes, stream->file);\r
   }\r
+#ifndef NO_ZLIB\r
   else if (stream->type == PMT_ZIP)\r
   {\r
     gzFile gf = stream->param;\r
@@ -254,6 +258,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
       /* we must reset stream pointer or else next seek/read fails */\r
       gzrewind(gf);\r
   }\r
+#endif\r
   else if (stream->type == PMT_CSO)\r
   {\r
     cso_struct *cso = stream->param;\r
@@ -329,6 +334,7 @@ int pm_seek(pm_file *stream, long offset, int whence)
     fseek(stream->file, offset, whence);\r
     return ftell(stream->file);\r
   }\r
+#ifndef NO_ZLIB\r
   else if (stream->type == PMT_ZIP)\r
   {\r
     if (PicoMessage != NULL && offset > 6*1024*1024) {\r
@@ -338,6 +344,7 @@ int pm_seek(pm_file *stream, long offset, int whence)
     }\r
     return gzseek((gzFile) stream->param, offset, whence);\r
   }\r
+#endif\r
   else if (stream->type == PMT_CSO)\r
   {\r
     cso_struct *cso = stream->param;\r
@@ -363,6 +370,7 @@ int pm_close(pm_file *fp)
   {\r
     fclose(fp->file);\r
   }\r
+#ifndef NO_ZLIB\r
   else if (fp->type == PMT_ZIP)\r
   {\r
     ZIP *zipfile = fp->file;\r
@@ -370,6 +378,7 @@ int pm_close(pm_file *fp)
     zipfile->fp = NULL; // gzclose() closed it\r
     closezip(zipfile);\r
   }\r
+#endif\r
   else if (fp->type == PMT_CSO)\r
   {\r
     free(fp->param);\r