idle debug removed, vpath added to Makefiles

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@526 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 66b27c2..97d7cc5 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -308,18 +308,8 @@ PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
 }\r
 \r
 \r
-// TODO: rm from Sek.c+asm too\r
-int idle_hit_counter = 0;\r
-\r
 void PicoFrame(void)\r
 {\r
-#if 1\r
-  if ((Pico.m.frame_count&0x3f) == 0) {\r
-    elprintf(EL_STATUS, "ihits: %i", idle_hit_counter);\r
-    idle_hit_counter = 0;\r
-  }\r
-#endif\r
-\r
   Pico.m.frame_count++;\r
 \r
   if (PicoAHW & PAHW_MCD) {\r

diff --git a/Pico/Sek.c b/Pico/Sek.c
index b03dd70..d641e04 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -182,9 +182,6 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 static int *idledet_addrs = NULL;\r
 static int idledet_count = 0, idledet_bads = 0;\r
 int idledet_start_frame = 0;\r
-int jumptab[0x10000];\r
-\r
-static unsigned char *rom_verify = NULL;\r
 \r
 void SekInitIdleDet(void)\r
 {\r
@@ -198,20 +195,17 @@ void SekInitIdleDet(void)
   idledet_count = idledet_bads = 0;\r
   idledet_start_frame = Pico.m.frame_count + 360;\r
 \r
-  rom_verify = realloc(rom_verify, Pico.romsize);\r
-  memcpy(rom_verify, Pico.rom, Pico.romsize);\r
 #ifdef EMU_C68K\r
   CycloneInitIdle();\r
 #endif\r
 #ifdef EMU_F68K\r
-  { extern void *get_jumptab(void);  memcpy(jumptab, get_jumptab(), sizeof(jumptab)); }\r
   fm68k_emulate(0, 0, 1);\r
 #endif\r
 }\r
 \r
 int SekIsIdleCode(unsigned short *dst, int bytes)\r
 {\r
-  printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
+  // printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
   switch (bytes)\r
   {\r
     case 4:\r
@@ -277,7 +271,6 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)
 \r
 void SekFinishIdleDet(void)\r
 {\r
-       int done_something = idledet_count > 0;\r
 #ifdef EMU_C68K\r
   CycloneFinishIdle();\r
 #endif\r
@@ -296,19 +289,6 @@ void SekFinishIdleDet(void)
     else\r
       elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);\r
   }\r
-\r
-  if (done_something)\r
-  {\r
-    int i, *jt;\r
-   extern void *get_jumptab(void);\r
-    for (i = 0; i < Pico.romsize; i++)\r
-      if (rom_verify[i] != Pico.rom[i])\r
-        printf("ROM corruption @ %06x!\n", i), exit(1);\r
-\r
-    jt = get_jumptab();\r
-    for (i = 0; i < 0x10000; i++)\r
-      if (jumptab[i] != jt[i]) { printf("jumptab broken @ %04x\n", i); exit(1); }\r
-  }\r
 }\r
 \r
 \r

diff --git a/cpu/Cyclone/tools/idle.s b/cpu/Cyclone/tools/idle.s
index 5445905..645ab9a 100644 (file)
--- 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 e1e1e45..ecbc056 100644 (file)
--- 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 d9beac8..0fd9feb 100644 (file)
--- 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\r
 \r
 # common\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
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
+       platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
 OBJS += ../../PicoAll.o\r
 else\r
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
-               ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \\r
-               ../../Pico/Patch.o\r
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
+               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o 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/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
+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/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 - Pico\r
-OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o\r
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\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
+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
 DEFINC += -D_ASM_DRAW_C\r
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o\r
+OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
 endif\r
 ifeq "$(asm_memory)" "1"\r
 DEFINC += -D_ASM_MEMORY_C\r
-OBJS += ../../Pico/memory_asm.o\r
+OBJS += Pico/memory_asm.o\r
 endif\r
 ifeq "$(asm_ym2612)" "1"\r
 DEFINC += -D_ASM_YM2612_C\r
-OBJS += ../../Pico/sound/ym2612_asm.o\r
+OBJS += Pico/sound/ym2612_asm.o\r
 endif\r
 ifeq "$(asm_misc)" "1"\r
 DEFINC += -D_ASM_MISC_C\r
-OBJS += ../../Pico/misc_asm.o\r
-OBJS += ../../Pico/cd/misc_asm.o\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
+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
+OBJS += Pico/cd/memory_asm.o\r
 endif\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += ../../Pico/sound/sound.o\r
+OBJS += Pico/sound/sound.o\r
 endif\r
-OBJS += ../../Pico/sound/mix_asm.o\r
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
+OBJS += Pico/sound/mix_asm.o\r
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
 # zlib\r
-OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
-       ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
+OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
+       zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
 # unzip\r
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += ../../Pico/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
 DEFINC += -DEMU_M68K\r
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o\r
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
 endif\r
 ifeq "$(use_cyclone)" "1"\r
 DEFINC += -DEMU_C68K\r
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o ../../cpu/Cyclone/tools/idle.o\r
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
 endif\r
 # drz80/mz80\r
 ifeq "$(mz80)" "1"\r
 DEFINC += -D_USE_MZ80\r
-OBJS += ../../cpu/mz80/mz80.o\r
+OBJS += cpu/mz80/mz80.o\r
 else\r
 DEFINC += -D_USE_DRZ80\r
-OBJS += ../../cpu/DrZ80/drz80.o\r
+OBJS += cpu/DrZ80/drz80.o\r
 endif\r
 \r
+vpath %.c = ../..\r
+vpath %.s = ../..\r
+vpath %.S = ../..\r
+DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+       zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
-all: PicoDrive.gpe\r
+\r
+all: mkdirs PicoDrive.gpe\r
 \r
 PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a\r
        @echo ">>>" $@\r
@@ -154,6 +159,22 @@ up: PicoDrive.gpe
 \r
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
+# cleanup\r
+clean: tidy\r
+       $(RM) PicoDrive.gpe\r
+tidy:\r
+       $(RM) $(OBJS)\r
+       rm -rf $(DIRS)\r
+#      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
+\r
+\r
+clean_prof:\r
+       find ../.. -name '*.gcno' -delete\r
+       find ../.. -name '*.gcda' -delete\r
+\r
+\r
+mkdirs:\r
+       mkdir -p $(DIRS)\r
 \r
 .c.o:\r
        @echo ">>>" $<\r
@@ -165,33 +186,33 @@ up: PicoDrive.gpe
        @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
+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
+Pico/draw_asm.o : ../../Pico/Draw.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s\r
+Pico/draw2_asm.o : ../../Pico/Draw2.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/memory_asm.o : ../../Pico/Memory.s\r
+Pico/memory_asm.o : ../../Pico/Memory.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
+Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
+Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/misc_asm.o : ../../Pico/Misc.s\r
+Pico/misc_asm.o : ../../Pico/Misc.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\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
+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
+Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
        @echo ">>>" $<\r
        $(AS) $(ASOPT) $< -o $@\r
 \r
@@ -203,8 +224,8 @@ up: PicoDrive.gpe
 ../../cpu/musashi/m68kops.c :\r
        @make -C ../../cpu/musashi\r
 \r
-../../Pico/Pico.o ../../Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h\r
-../../Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
+Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h\r
+Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
 \r
 # build helix libs\r
 ../common/helix/helix_mp3.a:\r
@@ -217,18 +238,6 @@ readme.txt: ../../tools/textfilter ../base_readme.txt
        make -C ../../tools/ textfilter\r
 \r
 \r
-# cleanup\r
-clean: tidy\r
-       $(RM) PicoDrive.gpe\r
-tidy:\r
-       $(RM) $(OBJS)\r
-#      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
-\r
-\r
-clean_prof:\r
-       find ../.. -name '*.gcno' -delete\r
-       find ../.. -name '*.gcda' -delete\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 ifeq ($(VER),)\r

diff --git a/platform/psp/Makefile b/platform/psp/Makefile
index 69505e3..075130e 100644 (file)
--- 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\r
 \r
 # common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/readpng.o\r
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o platform/common/readpng.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
 OBJS += ../../PicoAll.o\r
 else\r
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
-               ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \\r
-               ../../Pico/Patch.o ../../Pico/Draw_amips.o ../../Pico/Memory_amips.o ../../Pico/Misc_amips.o\r
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o \\r
+               Pico/Pico.o Pico/Sek.o Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o \\r
+               Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o Pico/Misc_amips.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/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
+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/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
 # Pico - carthw\r
-OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \\r
-               ../../Pico/carthw/svp/ssp16.o\r
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
+               Pico/carthw/svp/ssp16.o\r
 # Pico - Pico\r
-OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o\r
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
 endif\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += ../../Pico/sound/sound.o\r
+OBJS += Pico/sound/sound.o\r
 endif\r
-OBJS += ../../Pico/sound/mix.o\r
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
+OBJS += Pico/sound/mix.o\r
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
 # zlib (hacked)\r
-OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
-       ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o \\r
-       ../../zlib/uncompr.o\r
+OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
+       zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o \\r
+       zlib/uncompr.o\r
 # unzip\r
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
 CFLAGS += -DEMU_M68K\r
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o\r
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
 else\r
 CFLAGS += -DEMU_F68K\r
-OBJS += ../../cpu/fame/famec.o\r
+OBJS += cpu/fame/famec.o\r
 endif\r
 # z80\r
 ifeq "$(use_mz80)" "1"\r
 CFLAGS += -D_USE_MZ80\r
-OBJS += ../../cpu/mz80/mz80.o\r
+OBJS += cpu/mz80/mz80.o\r
 else\r
 CFLAGS += -D_USE_CZ80\r
-OBJS += ../../cpu/cz80/cz80.o\r
+OBJS += cpu/cz80/cz80.o\r
 endif\r
 # bg images\r
 OBJS += data/bg32.o data/bg40.o\r
 \r
+vpath %.c = ../..\r
+vpath %.s = ../..\r
+DIRS = platform platform/psp platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+       zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80\r
+\r
 \r
 LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge\r
 #LIBS += -lpspprof\r
@@ -86,7 +91,7 @@ LDFLAGS += -Wl,-Map=PicoDrive.map
 \r
 # target\r
 TARGET = PicoDrive\r
-EXTRA_TARGETS = EBOOT.PBP\r
+EXTRA_TARGETS = mkdirs EBOOT.PBP\r
 PSP_EBOOT_TITLE = PicoDrive\r
 PSP_EBOOT_ICON = data/icon.png\r
 #PSP_EBOOT_PIC1 = .png\r
@@ -99,6 +104,9 @@ CUSTOM_CLEAN = myclean
 include $(PSPSDK)/lib/build.mak\r
 \r
 # some additional rules\r
+mkdirs:\r
+       mkdir -p $(DIRS)\r
+\r
 .c.o:\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -c $< -o $@\r
@@ -112,27 +120,27 @@ AS := psp-as
 ../../cpu/musashi/m68kops.c :\r
        make -C ../../cpu/musashi\r
 \r
-../../cpu/fame/famec.o : ../../cpu/fame/famec.c\r
+cpu/fame/famec.o : ../../cpu/fame/famec.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -Wno-unused -c $< -o $@\r
 \r
-../../Pico/Memory.o : ../../Pico/Memory.c\r
+Pico/Memory.o : ../../Pico/Memory.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
 \r
-../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c\r
+Pico/cd/Memory.o : ../../Pico/cd/Memory.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r
-../../Pico/Draw.o : ../../Pico/Draw.c\r
+Pico/Draw.o : ../../Pico/Draw.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS\r
 \r
-../../Pico/Misc.o : ../../Pico/Misc.c\r
+Pico/Misc.o : ../../Pico/Misc.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
 \r
-../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c\r
+Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r
@@ -159,6 +167,7 @@ up: EBOOT.PBP
 # cleanup\r
 \r
 myclean:\r
+       rm -rf $(DIRS)\r
        $(RM) PicoDrive.map\r
        make -C ../../cpu/musashi clean\r
 \r