From 2fb6c387829e4a8cabb7f45490a8aa792d068ee0 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Wed, 14 Mar 2007 17:59:53 +0000
Subject: [PATCH] SekRunPS Cyclone integration

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@68 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 gp2x/Makefile | 14 ++++++++++++--
 gp2x/emu.c    |  2 +-
 gp2x/menu.c   |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 67bbb34..d6ba1d5 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -12,12 +12,13 @@ asm_memory = 0	# TODO
 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
@@ -61,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
@@ -93,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"
@@ -137,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 :
diff --git a/gp2x/emu.c b/gp2x/emu.c
index 99c80ba..a98a5be 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -547,7 +547,7 @@ int emu_WriteConfig(int game)
 		strncpy(cfg, PicoConfigFile, 511);
 		cfg[511] = 0;
 	} else {
-		romfname_ext(cfg, "cfg", ".pbcfg");
+		romfname_ext(cfg, "cfg/", ".pbcfg");
 	}
 
 	printf("emu_WriteConfig: %s ", cfg);
diff --git a/gp2x/menu.c b/gp2x/menu.c
index aa3019f..5cab760 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -744,7 +744,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3
 	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4
 	gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5
-	gp2x_text_out8(tl_x, (y+=10), "Better sync (very slow)    %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6
+	gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6
 	gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 7
 	gp2x_text_out8(tl_x, (y+=10), "Done");
 
-- 
2.39.2