.cue support, Pico stubs

[picodrive.git] / platform / gp2x / Makefile

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index dcd4531..203b9ca 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -34,7 +34,7 @@ endif
 DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK\r
 COPT_COMMON = -static -Wall -Winline\r
 ifeq ($(DEBUG),)\r
-COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
 COPT_COMMON += -ggdb\r
 endif\r
@@ -58,7 +58,7 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 OBJS += 940ctl.o\r
 \r
 # common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \\r
        ../common/readpng.o ../common/mp3_helix.o\r
 \r
 # Pico\r
@@ -70,9 +70,12 @@ OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.
                ../../Pico/Patch.o\r
 # Pico - CD\r
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \\r
-               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \\r
+               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/cue.o ../../Pico/cd/gfx_cd.o \\r
                ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o\r
 endif\r
+# Pico - carthw\r
+OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \\r
+               ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o\r
 \r
 # asm stuff\r
 ifeq "$(asm_render)" "1"\r
@@ -114,7 +117,7 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
+OBJS += ../../Pico/Debug.o ../../cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
@@ -138,15 +141,10 @@ endif
 all: PicoDrive.gpe\r
 \r
 PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a\r
-       @echo $@\r
-       @$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
+       @echo ">>>" $@\r
+       $(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
 ifeq ($(DEBUG),)\r
-       @$(STRIP) $@\r
-endif\r
-#      @$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe\r
-#      @gpecomp PicoDrive_.gpe $@\r
-ifeq "$(up)" "1"\r
-       @cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+       $(STRIP) $@\r
 endif\r
 \r
 up: PicoDrive.gpe\r
@@ -155,45 +153,45 @@ up: PicoDrive.gpe
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
 \r
-testrefr.gpe : test.o gp2x.o\r
-       @echo $@\r
-       @$(GCC) $(COPT) $^ -o $@\r
-       @$(STRIP) $@\r
-\r
 .c.o:\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+       @echo ">>>" $<\r
+       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
 .s.o:\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+       @echo ">>>" $<\r
+       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+.S.o:\r
+       @echo ">>>" $<\r
+       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+\r
+../../Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c\r
 \r
 ../../Pico/draw_asm.o : ../../Pico/Draw.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/draw2_asm.o : ../../Pico/Draw2.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/memory_asm.o : ../../Pico/Memory.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/misc_asm.o : ../../Pico/Misc.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 ../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
-       @echo $<\r
-       @$(AS) $(ASOPT) $< -o $@\r
+       @echo ">>>" $<\r
+       $(AS) $(ASOPT) $< -o $@\r
 \r
 # build Cyclone\r
 ../../cpu/Cyclone/proj/Cyclone.s :\r
@@ -234,7 +232,7 @@ $(error need VER)
 endif\r
 endif\r
 \r
-rel: PicoDrive.gpe code940/pico940.bin readme.txt PicoDrive.man.txt PicoDrive.png\r
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
        zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
 \r