From 8187ba84b7ed56e2535a8381ac66fb5b32414b39 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 6 Jul 2008 11:33:13 +0000
Subject: [PATCH] idle debug removed, vpath added to Makefiles

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@526 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 Pico/Pico.c              |  10 ----
 Pico/Sek.c               |  22 +-------
 cpu/Cyclone/tools/idle.s |   8 +--
 cpu/fame/famec_opcodes.h |  20 ++++---
 platform/gp2x/Makefile   | 117 +++++++++++++++++++++------------------
 platform/psp/Makefile    |  65 ++++++++++++----------
 6 files changed, 117 insertions(+), 125 deletions(-)

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 66b27c2a..97d7cc51 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -308,18 +308,8 @@ PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
 }
 
 
-// TODO: rm from Sek.c+asm too
-int idle_hit_counter = 0;
-
 void PicoFrame(void)
 {
-#if 1
-  if ((Pico.m.frame_count&0x3f) == 0) {
-    elprintf(EL_STATUS, "ihits: %i", idle_hit_counter);
-    idle_hit_counter = 0;
-  }
-#endif
-
   Pico.m.frame_count++;
 
   if (PicoAHW & PAHW_MCD) {
diff --git a/Pico/Sek.c b/Pico/Sek.c
index b03dd702..d641e045 100644
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -182,9 +182,6 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 static int *idledet_addrs = NULL;
 static int idledet_count = 0, idledet_bads = 0;
 int idledet_start_frame = 0;
-int jumptab[0x10000];
-
-static unsigned char *rom_verify = NULL;
 
 void SekInitIdleDet(void)
 {
@@ -198,20 +195,17 @@ void SekInitIdleDet(void)
   idledet_count = idledet_bads = 0;
   idledet_start_frame = Pico.m.frame_count + 360;
 
-  rom_verify = realloc(rom_verify, Pico.romsize);
-  memcpy(rom_verify, Pico.rom, Pico.romsize);
 #ifdef EMU_C68K
   CycloneInitIdle();
 #endif
 #ifdef EMU_F68K
-  { extern void *get_jumptab(void);  memcpy(jumptab, get_jumptab(), sizeof(jumptab)); }
   fm68k_emulate(0, 0, 1);
 #endif
 }
 
 int SekIsIdleCode(unsigned short *dst, int bytes)
 {
-  printf("SekIsIdleCode %04x %i\n", *dst, bytes);
+  // printf("SekIsIdleCode %04x %i\n", *dst, bytes);
   switch (bytes)
   {
     case 4:
@@ -277,7 +271,6 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)
 
 void SekFinishIdleDet(void)
 {
-	int done_something = idledet_count > 0;
 #ifdef EMU_C68K
   CycloneFinishIdle();
 #endif
@@ -296,19 +289,6 @@ void SekFinishIdleDet(void)
     else
       elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);
   }
-
-  if (done_something)
-  {
-    int i, *jt;
-   extern void *get_jumptab(void);
-    for (i = 0; i < Pico.romsize; i++)
-      if (rom_verify[i] != Pico.rom[i])
-        printf("ROM corruption @ %06x!\n", i), exit(1);
-
-    jt = get_jumptab();
-    for (i = 0; i < 0x10000; i++)
-      if (jumptab[i] != jt[i]) { printf("jumptab broken @ %04x\n", i); exit(1); }
-  }
 }
 
 
diff --git a/cpu/Cyclone/tools/idle.s b/cpu/Cyclone/tools/idle.s
index 5445905f..645ab9a8 100644
--- a/cpu/Cyclone/tools/idle.s
+++ b/cpu/Cyclone/tools/idle.s
@@ -90,10 +90,10 @@ cfi_loop:
 
 
 .macro inc_counter cond
-    ldr     r0, =idle_hit_counter
-    ldr     r1, [r0]
-    add     r1, r1, #1
-    str\cond r1, [r0]
+@    ldr     r0, =idle_hit_counter
+@    ldr     r1, [r0]
+@    add     r1, r1, #1
+@    str\cond r1, [r0]
 .endm
 
 idle_bra:
diff --git a/cpu/fame/famec_opcodes.h b/cpu/fame/famec_opcodes.h
index e1e1e451..ecbc056e 100644
--- a/cpu/fame/famec_opcodes.h
+++ b/cpu/fame/famec_opcodes.h
@@ -39962,6 +39962,15 @@ RET(14)
 }
 
 #ifdef PICODRIVE_HACK
+#if 0
+#define UPDATE_IDLE_COUNT { \
+	extern int idle_hit_counter; \
+	idle_hit_counter++; \
+}
+#else
+#define UPDATE_IDLE_COUNT
+#endif
+
 // BRA
 OPCODE(0x6001_idle)
 {
@@ -39974,10 +39983,7 @@ OPCODE(0x6001_idle)
 #else
 	PC += ((s8)(Opcode & 0xFE)) >> 1;
 #endif
-	{
-		extern int idle_hit_counter;
-		idle_hit_counter++;
-	}
+	UPDATE_IDLE_COUNT
 	m68kcontext.io_cycle_counter = 10;
 RET(10)
 }
@@ -39987,8 +39993,7 @@ OPCODE(0x6601_idle)
 {
 	if (flag_NotZ)
 	{
-		extern int idle_hit_counter;
-		idle_hit_counter++;
+		UPDATE_IDLE_COUNT
 		PC += ((s8)(Opcode & 0xFE)) >> 1;
 		m68kcontext.io_cycle_counter = 8;
 	}
@@ -39999,8 +40004,7 @@ OPCODE(0x6701_idle)
 {
 	if (!flag_NotZ)
 	{
-		extern int idle_hit_counter;
-		idle_hit_counter++;
+		UPDATE_IDLE_COUNT
 		PC += ((s8)(Opcode & 0xFE)) >> 1;
 		m68kcontext.io_cycle_counter = 8;
 	}
diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index d9beac81..0fd9feb9 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -58,89 +58,94 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 OBJS += 940ctl.o
 
 # common
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \
-	../common/readpng.o ../common/mp3_helix.o
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
+	platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
 else
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
-		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
-		../../Pico/Patch.o
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.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/cue.o ../../Pico/cd/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+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/cue.o Pico/cd/gfx_cd.o \
+		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
 endif
 # Pico - Pico
-OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
 # Pico - carthw
-OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \
-		../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
+		Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o
 
 # asm stuff
 ifeq "$(asm_render)" "1"
 DEFINC += -D_ASM_DRAW_C
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o
+OBJS += Pico/draw_asm.o Pico/draw2_asm.o
 endif
 ifeq "$(asm_memory)" "1"
 DEFINC += -D_ASM_MEMORY_C
-OBJS += ../../Pico/memory_asm.o
+OBJS += Pico/memory_asm.o
 endif
 ifeq "$(asm_ym2612)" "1"
 DEFINC += -D_ASM_YM2612_C
-OBJS += ../../Pico/sound/ym2612_asm.o
+OBJS += Pico/sound/ym2612_asm.o
 endif
 ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
-OBJS += ../../Pico/misc_asm.o
-OBJS += ../../Pico/cd/misc_asm.o
+OBJS += Pico/misc_asm.o
+OBJS += Pico/cd/misc_asm.o
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINC += -D_ASM_CD_PICO_C
-OBJS += ../../Pico/cd/pico_asm.o
+OBJS += Pico/cd/pico_asm.o
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINC += -D_ASM_CD_MEMORY_C
-OBJS += ../../Pico/cd/memory_asm.o
+OBJS += Pico/cd/memory_asm.o
 endif
 
 # Pico - sound
 ifneq "$(amalgamate)" "1"
-OBJS += ../../Pico/sound/sound.o
+OBJS += Pico/sound/sound.o
 endif
-OBJS += ../../Pico/sound/mix_asm.o
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += Pico/sound/mix_asm.o
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o
 # zlib
-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
+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 ../../unzip/unzip_stream.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # debug
 ifeq "$(debug_cyclone)" "1"
-OBJS += ../../Pico/Debug.o ../../cpu/musashi/m68kdasm.o
+OBJS += Pico/Debug.o cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o ../../cpu/Cyclone/tools/idle.o
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
 # drz80/mz80
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 DEFINC += -D_USE_DRZ80
-OBJS += ../../cpu/DrZ80/drz80.o
+OBJS += cpu/DrZ80/drz80.o
 endif
 
+vpath %.c = ../..
+vpath %.s = ../..
+vpath %.S = ../..
+DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
-all: PicoDrive.gpe
+
+all: mkdirs PicoDrive.gpe
 
 PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
 	@echo ">>>" $@
@@ -154,6 +159,22 @@ up: PicoDrive.gpe
 
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
+# cleanup
+clean: tidy
+	$(RM) PicoDrive.gpe
+tidy:
+	$(RM) $(OBJS)
+	rm -rf $(DIRS)
+#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
+
+
+clean_prof:
+	find ../.. -name '*.gcno' -delete
+	find ../.. -name '*.gcda' -delete
+
+
+mkdirs:
+	mkdir -p $(DIRS)
 
 .c.o:
 	@echo ">>>" $<
@@ -165,33 +186,33 @@ up: PicoDrive.gpe
 	@echo ">>>" $<
 	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
-../../Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
+Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
 
-../../Pico/draw_asm.o : ../../Pico/Draw.s
+Pico/draw_asm.o : ../../Pico/Draw.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s
+Pico/draw2_asm.o : ../../Pico/Draw2.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/memory_asm.o : ../../Pico/Memory.s
+Pico/memory_asm.o : ../../Pico/Memory.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
+Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
+Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/misc_asm.o : ../../Pico/Misc.s
+Pico/misc_asm.o : ../../Pico/Misc.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
+Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
+Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
+Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
 
@@ -203,8 +224,8 @@ up: PicoDrive.gpe
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
 
-../../Pico/Pico.o ../../Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
-../../Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
+Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
+Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
 
 # build helix libs
 ../common/helix/helix_mp3.a:
@@ -217,18 +238,6 @@ readme.txt: ../../tools/textfilter ../base_readme.txt
 	make -C ../../tools/ textfilter
 
 
-# cleanup
-clean: tidy
-	$(RM) PicoDrive.gpe
-tidy:
-	$(RM) $(OBJS)
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
-
-
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
-
 # ----------- release -----------
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)
 ifeq ($(VER),)
diff --git a/platform/psp/Makefile b/platform/psp/Makefile
index 69505e32..075130ee 100644
--- a/platform/psp/Makefile
+++ b/platform/psp/Makefile
@@ -27,57 +27,62 @@ endif
 OBJS += main.o emu.o mp3.o menu.o psp.o asm_utils.o
 
 # common
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/readpng.o
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o platform/common/readpng.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
 else
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
-		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
-		../../Pico/Patch.o ../../Pico/Draw_amips.o ../../Pico/Memory_amips.o ../../Pico/Misc_amips.o
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o \
+		Pico/Pico.o Pico/Sek.o Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o \
+		Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o Pico/Misc_amips.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/cue.o ../../Pico/cd/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+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/cue.o Pico/cd/gfx_cd.o \
+		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
 # Pico - carthw
-OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \
-		../../Pico/carthw/svp/ssp16.o
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
+		Pico/carthw/svp/ssp16.o
 # Pico - Pico
-OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
 endif
 
 # Pico - sound
 ifneq "$(amalgamate)" "1"
-OBJS += ../../Pico/sound/sound.o
+OBJS += Pico/sound/sound.o
 endif
-OBJS += ../../Pico/sound/mix.o
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += Pico/sound/mix.o
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o
 # zlib (hacked)
-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 \
-	../../zlib/uncompr.o
+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 \
+	zlib/uncompr.o
 # unzip
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
 CFLAGS += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 else
 CFLAGS += -DEMU_F68K
-OBJS += ../../cpu/fame/famec.o
+OBJS += cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
 CFLAGS += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 CFLAGS += -D_USE_CZ80
-OBJS += ../../cpu/cz80/cz80.o
+OBJS += cpu/cz80/cz80.o
 endif
 # bg images
 OBJS += data/bg32.o data/bg40.o
 
+vpath %.c = ../..
+vpath %.s = ../..
+DIRS = platform platform/psp platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
+
 
 LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge
 #LIBS += -lpspprof
@@ -86,7 +91,7 @@ LDFLAGS += -Wl,-Map=PicoDrive.map
 
 # target
 TARGET = PicoDrive
-EXTRA_TARGETS = EBOOT.PBP
+EXTRA_TARGETS = mkdirs EBOOT.PBP
 PSP_EBOOT_TITLE = PicoDrive
 PSP_EBOOT_ICON = data/icon.png
 #PSP_EBOOT_PIC1 = .png
@@ -99,6 +104,9 @@ CUSTOM_CLEAN = myclean
 include $(PSPSDK)/lib/build.mak
 
 # some additional rules
+mkdirs:
+	mkdir -p $(DIRS)
+
 .c.o:
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -112,27 +120,27 @@ AS := psp-as
 ../../cpu/musashi/m68kops.c :
 	make -C ../../cpu/musashi
 
-../../cpu/fame/famec.o : ../../cpu/fame/famec.c
+cpu/fame/famec.o : ../../cpu/fame/famec.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@
 
-../../Pico/Memory.o : ../../Pico/Memory.c
+Pico/Memory.o : ../../Pico/Memory.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS
 
-../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c
+Pico/cd/Memory.o : ../../Pico/cd/Memory.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -O2 -c $< -o $@
 
-../../Pico/Draw.o : ../../Pico/Draw.c
+Pico/Draw.o : ../../Pico/Draw.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS
 
-../../Pico/Misc.o : ../../Pico/Misc.c
+Pico/Misc.o : ../../Pico/Misc.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS
 
-../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c
+Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -O2 -c $< -o $@
 
@@ -159,6 +167,7 @@ up: EBOOT.PBP
 # cleanup
 
 myclean:
+	rm -rf $(DIRS)
 	$(RM) PicoDrive.map
 	make -C ../../cpu/musashi clean
 
-- 
2.39.5