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

diff --git a/Makefile b/Makefile
index 9b364dd..9b7e37e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,22 @@
 TARGET ?= PicoDrive
+DEBUG = 0
 CFLAGS += -Wall 
 CFLAGS += -I. -DINLINE=inline
-ifndef DEBUG
-ifeq ($(platform), vita)
-CFLAGS += -O3 -DNDEBUG
+
+ifeq ($(DEBUG),1)
+	CFLAGS += -g -O0
 else
-CFLAGS += -O2 -DNDEBUG -ffunction-sections
+	ifeq ($(platform), vita)
+		CFLAGS += -O3 -DNDEBUG
+	else
+		CFLAGS += -O2 -DNDEBUG -ffunction-sections
+	endif
 endif
+
 ifneq ($(APPLE),1)
-LDFLAGS += -Wl,--gc-sections
-endif
+	LDFLAGS += -Wl,--gc-sections
 endif
+
 #CFLAGS += -DEVT_LOG
 #CFLAGS += -DDRC_CMP
 #cpu_cmp = 1
@@ -21,7 +27,6 @@ ifeq ($(WANT_GDB),1)
 CFLAGS += ggdb -falign-functions=2
 endif
 
-
 all: config.mak target_
 
 ifndef NO_CONFIG_MAK
@@ -50,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
@@ -62,7 +66,6 @@ endif
 
 ifneq "$(use_cyclone)" "1"
 # due to CPU stop flag access
-asm_cdpico = 0
 asm_cdmemory = 0
 endif
 
@@ -160,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
@@ -201,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