X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=78187416039a0b076e97ae7a036d39fd9fc5e6a4;hb=66fdc0f0d590809fb0040d08fd57607bf80b1abc;hp=c5d339f592e18b8a430ac1d5bf0ef7e8942eb38d;hpb=3a81ecde1cf95372e27a3e6ca6f9c2cccc86e272;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index c5d339f..7818741 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -8,16 +8,17 @@ CROSS = arm-linux-
 dprint = 1
 #mz80 = 1
 #debug_cyclone = 1
-asm_memory = 0	# TODO
+asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
+asm_cdpico = 1
 #profile = 1
 #use_musashi = 1
 #up = 1
 
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
+COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -38,11 +39,12 @@ OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpu
 OBJS += 940ctl.o
 # Pico
 OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
-		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o
+		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
+		../../Pico/Patch.o
 # Pico - CD
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
 		../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o
+		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
 # asm stuff
 ifeq "$(asm_render)" "1"
 DEFINC += -D_ASM_DRAW_C
@@ -60,6 +62,10 @@ ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
 OBJS += ../../Pico/misc_asm.o
 endif
+ifeq "$(asm_cdpico)" "1"
+DEFINC += -D_ASM_CD_PICO_C
+OBJS += ../../Pico/cd/pico_asm.o
+endif
 # Pico - sound
 OBJS += ../../Pico/sound/mix_asm.o
 OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
@@ -67,7 +73,7 @@ OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2
 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
 # unzip
-OBJS += ../../unzip/unzip.o
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 # mp3
 OBJS += mp3.o
 # CPU cores
@@ -92,8 +98,10 @@ all: PicoDrive.gpe
 
 PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
 	@echo $@
-	@$(GCC) -o $@ $(COPT) $^ -lm
+	@$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map
+ifeq ($(DEBUG),)
 	@$(STRIP) $@
+endif
 #	@$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe
 #	@gpecomp PicoDrive_.gpe $@
 ifeq "$(up)" "1"
@@ -136,6 +144,9 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/misc_asm.o : ../../Pico/misc.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :