X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=9b7e37e89f20d4ff7dec1708c44ffce410c41854;hb=ebf923683facb316a0e9fc8d26a7a0b4e4bacbfc;hp=ca8ccf6e29a50384897feb8ede3915f56604df0e;hpb=b2410633936aa216e7a82fa41fea5ee5ce1fb6ea;p=picodrive.git

diff --git a/Makefile b/Makefile
index ca8ccf6..9b7e37e 100644
--- 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,13 +163,14 @@ 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
-# unzip
-OBJS += unzip/unzip.o unzip/unzip_stream.o
+CFLAGS += -Izlib
 endif
+# unzip
+OBJS += unzip/unzip.o
 
 
 include platform/common/common.mak
@@ -206,6 +205,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