better mmuhack usage

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 67bbb34..abb6be4 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -8,16 +8,18 @@ CROSS = arm-linux-
 dprint = 1\r
 #mz80 = 1\r
 #debug_cyclone = 1\r
-asm_memory = 0 # TODO\r
+asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
+asm_cdpico = 1\r
+asm_cdmemory = 1\r
 #profile = 1\r
 #use_musashi = 1\r
 #up = 1\r
 \r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
 endif\r
@@ -60,6 +62,15 @@ endif
 ifeq "$(asm_misc)" "1"\r
 DEFINC += -D_ASM_MISC_C\r
 OBJS += ../../Pico/misc_asm.o\r
+OBJS += ../../Pico/cd/misc_asm.o\r
+endif\r
+ifeq "$(asm_cdpico)" "1"\r
+DEFINC += -D_ASM_CD_PICO_C\r
+OBJS += ../../Pico/cd/pico_asm.o\r
+endif\r
+ifeq "$(asm_cdmemory)" "1"\r
+DEFINC += -D_ASM_CD_MEMORY_C\r
+OBJS += ../../Pico/cd/memory_asm.o\r
 endif\r
 # Pico - sound\r
 OBJS += ../../Pico/sound/mix_asm.o\r
@@ -74,7 +85,8 @@ OBJS += mp3.o
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
 DEFINC += -DEMU_M68K\r
-OBJS += _build\m68kcpu.o _build\m68kopac.o _build\m68kopdm.o _build\m68kopnz.o _build\m68kops.o\r
+OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o\r
+OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o\r
 else\r
 DEFINC += -DEMU_C68K\r
 OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
@@ -93,8 +105,10 @@ all: PicoDrive.gpe
 \r
 PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
        @echo $@\r
-       @$(GCC) -o $@ $(COPT) $^ -lm\r
+       @$(GCC) -o $@ $(COPT) $^ -lm -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
@@ -102,7 +116,7 @@ ifeq "$(up)" "1"
 endif\r
 \r
 up: PicoDrive.gpe\r
-       @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+       @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
 \r
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
@@ -137,6 +151,15 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/misc_asm.o : ../../Pico/misc.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
+       @echo $<\r
+       @$(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
+       @echo $<\r
+       @$(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s\r
+       @echo $<\r
+       @$(AS) $(ASOPT) $< -o $@\r
 \r
 # build Cyclone\r
 ../../cpu/Cyclone/proj/Cyclone.s :\r
@@ -167,7 +190,7 @@ $(error need VER)
 endif\r
 endif\r
 \r
-rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt\r
+rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
 \r
 code940/code940.bin:\r
@@ -175,15 +198,15 @@ code940/code940.bin:
 \r
 \r
 # test\r
-usbjoy.o : usbjoy.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-\r
-../../Pico/Cart.o : ../../Pico/Cart.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-\r
-../../zlib/trees.o : ../../zlib/trees.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#usbjoy.o : usbjoy.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#\r
+#../../Pico/Cart.o : ../../Pico/Cart.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#\r
+#../../zlib/trees.o : ../../zlib/trees.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
 \r