X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=9b364dd9cd2ed9657333bff693488f058fc25894;hb=e8454cb09b4e787ee847ba64936f79b3f08a4ea3;hp=9201afb0f9f1794451d83c2d1066fcc14bf9bb63;hpb=f18d0e083ce89df07ef7a0c0cf5dc200638ad5d2;p=picodrive.git

diff --git a/Makefile b/Makefile
index 9201afb..9b364dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,13 @@
 TARGET ?= PicoDrive
-CFLAGS += -Wall -ggdb -falign-functions=2
-CFLAGS += -I.
+CFLAGS += -Wall 
+CFLAGS += -I. -DINLINE=inline
 ifndef DEBUG
+ifeq ($(platform), vita)
+CFLAGS += -O3 -DNDEBUG
+else
 CFLAGS += -O2 -DNDEBUG -ffunction-sections
-ifeq ($(findstring clang,$(CC)),)
+endif
+ifneq ($(APPLE),1)
 LDFLAGS += -Wl,--gc-sections
 endif
 endif
@@ -13,6 +17,10 @@ endif
 #drc_debug = 7
 #profile = 1
 
+ifeq ($(WANT_GDB),1)
+CFLAGS += ggdb -falign-functions=2
+endif
+
 
 all: config.mak target_
 
@@ -109,7 +117,7 @@ USE_FRONTEND = 1
 PLATFORM_MP3 = 1
 endif
 ifeq "$(PLATFORM)" "libretro"
-OBJS += platform/libretro.o 
+OBJS += platform/libretro/libretro.o 
 endif
 
 ifeq "$(USE_FRONTEND)" "1"
@@ -152,11 +160,13 @@ 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
 OBJS += unzip/unzip.o unzip/unzip_stream.o
+endif
 
 
 include platform/common/common.mak
@@ -195,7 +205,7 @@ tools/textfilter: tools/textfilter.c
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing
 pico/mode4.o: CFLAGS += -fno-strict-aliasing
-pico/cd/memory.o: CFLAGS += -fno-strict-aliasing
+pico/cd/cd_memory.o: CFLAGS += -fno-strict-aliasing
 pico/cd/cd_file.o: CFLAGS += -fno-strict-aliasing
 pico/cd/pcm.o: CFLAGS += -fno-strict-aliasing
 pico/cd/LC89510.o: CFLAGS += -fno-strict-aliasing
@@ -206,5 +216,5 @@ pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c
 pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
-pico/memory.o pico/cd/memory.o pico/32x/memory.o : pico/pico_int.h pico/memory.h
+pico/memory.o pico/cd/cd_memory.o pico/32x/32x_memory.o : pico/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h