lowercasing filenames, part1; makefile adjustments

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

diff --git a/common/common_arm.mak b/common/common_arm.mak
index 5308fb3..ec0c65a 100644 (file)
--- a/common/common_arm.mak
+++ b/common/common_arm.mak
@@ -1,3 +1,31 @@
+# asm stuff
+ifeq "$(asm_render)" "1"
+DEFINC += -D_ASM_DRAW_C
+OBJS += pico/draw_arm.o pico/draw2_arm.o
+endif
+ifeq "$(asm_memory)" "1"
+DEFINC += -D_ASM_MEMORY_C
+OBJS += pico/memory_arm.o
+endif
+ifeq "$(asm_ym2612)" "1"
+DEFINC += -D_ASM_YM2612_C
+OBJS += pico/sound/ym2612_arm.o
+endif
+ifeq "$(asm_misc)" "1"
+DEFINC += -D_ASM_MISC_C
+OBJS += pico/misc_arm.o
+OBJS += pico/cd/misc_arm.o
+endif
+ifeq "$(asm_cdpico)" "1"
+DEFINC += -D_ASM_CD_PICO_C
+OBJS += pico/cd/pico_arm.o
+endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINC += -D_ASM_CD_MEMORY_C
+OBJS += pico/cd/memory_arm.o
+endif
+
+
 .c.o:
        @echo ">>>" $<
        $(CC) $(CFLAGS) $(DEFINC) -c $< -o $@
@@ -18,47 +46,18 @@ mkdirs:
        mkdir -p $(DIRS)
 
 # deps
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
-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
-
-# individual rules
-Pico/draw_asm.o : ../../Pico/Draw.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/misc_asm.o : ../../Pico/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-#Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S
-#      @echo ">>>" $@
-#      $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@
+pico/carthw/svp/compiler.o : ../../pico/carthw/svp/ssp16.o ../../pico/carthw/svp/gen_arm.c
+pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
 
 # build Cyclone
 cpu/Cyclone/proj/Cyclone.s:
        @echo building Cyclone...
        @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
 
+../../cpu/musashi/m68kops.c :
+       @make -C ../../cpu/musashi
+
 # build helix libs
 ../common/helix/$(CROSS)helix-mp3.a:
        make -C ../common/helix clean all

diff --git a/common/config.c b/common/config.c
index c530c95..2704aca 100644 (file)
--- a/common/config.c
+++ b/common/config.c
@@ -18,7 +18,7 @@ static char *mystrip(char *str);
 
 #include "menu.h"
 #include "emu.h"
-#include <Pico/Pico.h>
+#include <pico/pico.h>
 
 extern menu_entry opt_entries[];
 extern menu_entry opt2_entries[];

diff --git a/common/emu.c b/common/emu.c
index eaabe08..73ca01b 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -17,9 +17,9 @@
 #include "config.h"\r
 #include "common.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/cd/cue.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/cd/cue.h>\r
 #include <zlib/zlib.h>\r
 \r
 \r

diff --git a/common/menu.c b/common/menu.c
index 169b892..1becb83 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -338,8 +338,8 @@ int me_process(menu_entry *entries, int count, menu_id id, int is_next)
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
 \r
-#include <Pico/Pico.h>\r
-#include <Pico/Debug.h>\r
+#include <pico/pico.h>\r
+#include <pico/debug.h>\r
 \r
 void SekStepM68k(void);\r
 \r

diff --git a/common/mp3_helix.c b/common/mp3_helix.c
index f28abda..718c3de 100644 (file)
--- a/common/mp3_helix.c
+++ b/common/mp3_helix.c
@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/sound/mix.h"
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/mix.h"
 #include "helix/pub/mp3dec.h"
 #include "lprintf.h"
 

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index f01ffa3..1c6e4ca 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -18,9 +18,9 @@
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
-#include "../../Pico/PicoInt.h"\r
-#include "../../Pico/sound/ym2612.h"\r
-#include "../../Pico/sound/mix.h"\r
+#include "../../pico/pico_int.h"\r
+#include "../../pico/sound/ym2612.h"\r
+#include "../../pico/sound/mix.h"\r
 \r
 /* we will need some gp2x internals here */\r
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 06761a3..b8bf448 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -64,54 +64,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\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 Pico/Debug.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 pico/debug.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
-\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
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\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
-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
-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
+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
 # 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_arm.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
@@ -119,7 +92,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
+OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
@@ -142,12 +115,14 @@ endif
 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
+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
 \r
 all: mkdirs PicoDrive.gpe\r
 \r
+include ../common/common_arm.mak\r
+\r
 PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
        $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
@@ -158,22 +133,14 @@ endif
 up: PicoDrive.gpe\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
-# cleanup\r
 clean: tidy\r
        $(RM) PicoDrive.gpe\r
 tidy:\r
        $(RM) $(OBJS)\r
-#      rm -rf $(DIRS) # don't clean, gcda may be there\r
-#      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
-\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r
 \r
-include ../common/common_arm.mak\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 ifeq ($(VER),)\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index dc78521..77bd83e 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -24,9 +24,9 @@
 #include "../common/config.h"\r
 #include "cpuctrl.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/sound/mix.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index b7bd3f1..e37c878 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -20,8 +20,8 @@
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
 #include <zlib/zlib.h>\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r

diff --git a/linux/940ctl_ym2612.c b/linux/940ctl_ym2612.c
index b6b593a..9d7e38d 100644 (file)
--- a/linux/940ctl_ym2612.c
+++ b/linux/940ctl_ym2612.c
@@ -8,13 +8,13 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "../../Pico/sound/ym2612.h"
+#include "../../pico/sound/ym2612.h"
 #include "../gp2x/gp2x.h"
 #include "../gp2x/emu.h"
 #include "../gp2x/menu.h"
 #include "../gp2x/code940/940shared.h"
 #include "../common/helix/pub/mp3dec.h"
-#include "../../Pico/PicoInt.h"
+#include "../../pico/pico_int.h"
 
 
 // static _940_data_t  shared_data_;

diff --git a/linux/Makefile b/linux/Makefile
index 5b33ba3..442b50a 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -35,19 +35,19 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/config.o pl
                platform/common/readpng.o platform/common/mp3_helix.o
 
 # Pico
-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/Debug.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/debug.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 - 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 - sound
-OBJS += Pico/sound/sound.o Pico/sound/sn76496.o Pico/sound/ym2612.o Pico/sound/mix.o
+OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.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
+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
 # 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 zlib/uncompr.o
@@ -73,13 +73,14 @@ endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
-OBJS += Pico/DebugCPU.o
+OBJS += pico/debugCPU.o
 OBJS += cpu/musashi/m68kdasm.o
 endif
 endif
+OBJS += cpu/musashi/m68kdasm.o
 
 vpath %.c = ../..
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
        zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
 
 all: mkdirs PicoDrive
@@ -98,9 +99,9 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 mkdirs:
        mkdir -p $(DIRS)
 
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/gen_arm.c
-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/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
+pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
 
 ../../cpu/musashi/m68kops.c :
        @make -C ../../cpu/musashi
@@ -123,7 +124,7 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
        $(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 
-Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
+pico/sound/ym2612.o : ../../pico/sound/ym2612.c
        @echo ">>>" $@
        $(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@
 

diff --git a/pandora/Makefile b/pandora/Makefile
index 9cd4e1f..50c34d6 100644 (file)
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -41,9 +41,10 @@ endif
 ifeq "$(profile)" "2"\r
 COPT_COMMON += -fprofile-use\r
 endif\r
-COPT = $(COPT_COMMON)\r
-ASOPT =\r
-GCC = $(CROSS)gcc\r
+CFLAGS = $(COPT_COMMON)\r
+SFLAGS = $(CFLAGS)\r
+ASFLAGS = -mcpu=cortex-a8\r
+CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
 LD = $(CROSS)ld\r
@@ -58,54 +59,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\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 Pico/Debug.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 pico/debug.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
-\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
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\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
-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
-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
+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
 # 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_arm.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
@@ -113,7 +87,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
+OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
@@ -145,99 +119,29 @@ endif
 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
+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
 \r
 all: mkdirs PicoDrive\r
 \r
+include ../common/common_arm.mak\r
+\r
 PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
-       $(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng\r
+       $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map # -lpng\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r
 \r
-\r
-# cleanup\r
 clean: tidy\r
        $(RM) PicoDrive\r
 tidy:\r
        $(RM) $(OBJS)\r
-#      rm -rf $(DIRS) # don't clean, gcda may be there\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
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.s.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.S.o:\r
-       @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
-\r
-Pico/draw_asm.o : ../../Pico/Draw.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/draw2_asm.o : ../../Pico/Draw2.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\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
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\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
-       @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
-       @echo building Cyclone...\r
-       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
-\r
-../../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
-\r
-# build helix libs\r
-../common/helix/$(CROSS)helix-mp3.a:\r
-       make -C ../common/helix clean all\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r
 \r
-../../tools/textfilter: ../../tools/textfilter.c\r
-       make -C ../../tools/ textfilter\r
-\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 $(error TODO)\r

diff --git a/pandora/emu.c b/pandora/emu.c
index 0c6935b..1d0b33b 100644 (file)
--- a/pandora/emu.c
+++ b/pandora/emu.c
@@ -24,9 +24,9 @@
 #include "../common/common.h"\r
 #include "asm_utils.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/sound/mix.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r
@@ -294,8 +294,8 @@ static int EmuScanEnd16(unsigned int num)
                len = 256;\r
        }\r
 \r
-       if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
-               mask=0x3f; // accurate sprites, upper bits are priority stuff\r
+       if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
+               mask=0x3f; // messed sprites, upper bits are priority stuff\r
 \r
 #if 1\r
        clut_line(pd, ps, pal, (mask<<16) | len);\r
@@ -775,6 +775,11 @@ void emu_forcedFrame(int opts)
        currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
+void emu_platformDebugCat(char *str)\r
+{\r
+       // nothing\r
+}\r
+\r
 static void simpleWait(int thissec, int lim_time)\r
 {\r
        struct timeval tval;\r

diff --git a/psp/Makefile b/psp/Makefile
index 21b2d6a..1d6b673 100644 (file)
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -10,7 +10,7 @@ for_15fw = 1
 # :!touch platform/psp/psp.c\r
 \r
 \r
-CFLAGS += -I../.. -I. -DNO_SYNC\r
+CFLAGS += -I../.. -I. -DNO_SYNC -D_ASM_DRAW_C_AMIPS\r
 CFLAGS += -Wall -Winline -G0\r
 #CFLAGS += -DLPRINTF_STDIO\r
 #CFLAGS += -pg\r
@@ -32,28 +32,28 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o Pico/VideoPort.o \\r
-               Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o \\r
-               Pico/Misc_amips.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o pico/videoport.o \\r
+               pico/draw2.o pico/draw.o pico/patch.o pico/draw_amips.o pico/memory_amips.o \\r
+               pico/misc_amips.o pico/debug.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
@@ -81,7 +81,7 @@ OBJS += data/bg32.o data/bg40.o
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
-DIRS = platform platform/psp platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\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
@@ -125,23 +125,19 @@ cpu/fame/famec.o : ../../cpu/fame/famec.c
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -Wno-unused -c $< -o $@\r
 \r
-Pico/Memory.o : ../../Pico/Memory.c\r
+pico/misc.o : ../../pico/misc.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
-       @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
+       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
 \r
-Pico/Draw.o : ../../Pico/Draw.c\r
+pico/memory.o : ../../pico/memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
 \r
-Pico/Misc.o : ../../Pico/Misc.c\r
+pico/cd/memory.o : ../../pico/cd/memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\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

diff --git a/psp/emu.c b/psp/emu.c
index 5c87355..91bd563 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -21,8 +21,8 @@
 #include "../common/emu.h"
 #include "../common/config.h"
 #include "../common/lprintf.h"
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/cd/cue.h"
+#include <pico/pico_int.h>
+#include <pico/cd/cue.h>
 
 #define OSD_FPS_X 432
 

diff --git a/psp/menu.c b/psp/menu.c
index 0e578b1..6fe06ae 100644 (file)
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -27,8 +27,8 @@
 #include "../common/lprintf.h"
 #include "version.h"
 
-#include <Pico/PicoInt.h>
-#include <Pico/Patch.h>
+#include <pico/pico_int.h>
+#include <pico/patch.h>
 #include <zlib/zlib.h>
 
 

diff --git a/psp/mp3.c b/psp/mp3.c
index 19f6ec3..c1e6089 100644 (file)
--- a/psp/mp3.c
+++ b/psp/mp3.c
@@ -11,8 +11,8 @@
 #include <pspaudiocodec.h>
 #include <kubridge.h>
 
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/sound/mix.h"
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/mix.h"
 #include "../common/lprintf.h"
 
 int mp3_last_error = 0;