use system's zlib

[picodrive.git] / Makefile

diff --git a/Makefile b/Makefile
index ca8ccf6..3b5a714 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,6 @@ asm_memory ?= 1
 asm_render ?= 1
 asm_ym2612 ?= 1
 asm_misc ?= 1
-asm_cdpico ?= 1
 asm_cdmemory ?= 1
 asm_mix ?= 1
 else # if not arm
@@ -67,7 +66,6 @@ endif
 
 ifneq "$(use_cyclone)" "1"
 # due to CPU stop flag access
-asm_cdpico = 0
 asm_cdmemory = 0
 endif
 
@@ -165,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
@@ -206,6 +206,9 @@ tools/textfilter: tools/textfilter.c
 .s.o:
        $(CC) $(CFLAGS) -c $< -o $@
 
+.S.o:
+       $(CC) $(CFLAGS) -c $< -o $@
+
 # special flags - perhaps fix this someday instead?
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing