X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=d094104cc08ce4c06c7b3255abcf523e93205ed3;hb=835122bc0c583a74707847f350349e6050b42bb5;hp=17d04b8ce3fa1a158d57ac720d60ce12d3b84b22;hpb=9c9cda8c39bd2a6b99b8420a3034c454bc713954;p=picodrive.git

diff --git a/Makefile b/Makefile
index 17d04b8..d094104 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ CFLAGS += -O2 -DNDEBUG
 endif
 #CFLAGS += -DEVT_LOG
 #CFLAGS += -DDRC_CMP
-#drc_debug = 4
+#cpu_cmp = 1
+#drc_debug = 7
 #profile = 1
 
 
@@ -49,7 +50,7 @@ endif
 
 -include Makefile.local
 
-ifeq "$(use_musashi)" "1"
+ifneq "$(use_cyclone)" "1"
 # due to CPU stop flag access
 asm_cdpico = 0
 asm_cdmemory = 0
@@ -73,6 +74,23 @@ OBJS += platform/libpicofe/linux/xenv.o
 OBJS += platform/libpicofe/pandora/plat.o
 USE_FRONTEND = 1
 endif
+ifeq "$(PLATFORM)" "gp2x"
+OBJS += platform/common/arm_utils.o 
+OBJS += platform/libpicofe/gp2x/in_gp2x.o
+OBJS += platform/libpicofe/gp2x/soc.o 
+OBJS += platform/libpicofe/gp2x/soc_mmsp2.o 
+OBJS += platform/libpicofe/gp2x/soc_pollux.o 
+OBJS += platform/libpicofe/gp2x/plat.o 
+OBJS += platform/libpicofe/gp2x/pollux_set.o 
+OBJS += platform/gp2x/940ctl.o 
+OBJS += platform/gp2x/plat.o 
+OBJS += platform/gp2x/emu.o 
+OBJS += platform/gp2x/vid_mmsp2.o 
+OBJS += platform/gp2x/vid_pollux.o 
+OBJS += platform/gp2x/warm.o 
+USE_FRONTEND = 1
+PLATFORM_MP3 = 1
+endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += platform/libretro.o 
 endif
@@ -110,7 +128,8 @@ endif
 endif # USE_FRONTEND
 
 OBJS += platform/common/mp3.o
-ifeq "$(HAVE_LIBAVCODEC)" "1"
+ifeq "$(PLATFORM_MP3)" "1"
+else ifeq "$(HAVE_LIBAVCODEC)" "1"
 OBJS += platform/common/mp3_libavcodec.o
 else
 OBJS += platform/common/mp3_dummy.o
@@ -150,11 +169,21 @@ tools/textfilter: tools/textfilter.c
 .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
+pico/mode4.o: CFLAGS += -fno-strict-aliasing
+pico/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
+pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
+
 # random deps
 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/pico.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
+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/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h