(PSP/PS3) Resolve namespace conflict with memcpy16 for PS3 -

[picodrive.git] / Makefile

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