X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=ca7dc49d2f7b186f344a08d0c3ad1d47f1a498b6;hb=ae7830aae15ce83a9256fb3f893efef00e53a105;hp=70ce193a518fa75ef76b6c76b1fe4a34a19e74c5;hpb=0270424fac34be5b63fb37caaaca60e378365d81;p=picodrive.git

diff --git a/Makefile b/Makefile
index 70ce193..ca7dc49 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,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
@@ -54,7 +53,6 @@ endif
 
 ifneq "$(use_cyclone)" "1"
 # due to CPU stop flag access
-asm_cdpico = 0
 asm_cdmemory = 0
 endif
 
@@ -164,11 +162,14 @@ else
 OBJS += platform/common/mp3_dummy.o
 endif
 
+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
+OBJS += unzip/unzip.o
 
 
 include platform/common/common.mak
@@ -199,6 +200,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