From f11bad75edc8966e9f84b040163cc86e830c46c6 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 28 Aug 2008 12:21:04 +0000 Subject: [PATCH] lowercasing filenames, part1; makefile adjustments git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@574 be3aeb3a-fb24-0410-a615-afba39da0efa --- common/common_arm.mak | 69 +++++++++++---------- common/config.c | 2 +- common/emu.c | 6 +- common/menu.c | 4 +- common/mp3_helix.c | 4 +- gp2x/940ctl.c | 6 +- gp2x/Makefile | 65 +++++--------------- gp2x/emu.c | 6 +- gp2x/menu.c | 4 +- linux/940ctl_ym2612.c | 4 +- linux/Makefile | 31 +++++----- pandora/Makefile | 138 +++++++----------------------------------- pandora/emu.c | 15 +++-- psp/Makefile | 48 +++++++-------- psp/emu.c | 4 +- psp/menu.c | 4 +- psp/mp3.c | 4 +- 17 files changed, 143 insertions(+), 271 deletions(-) diff --git a/common/common_arm.mak b/common/common_arm.mak index 5308fb3..ec0c65a 100644 --- 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 --- a/common/config.c +++ b/common/config.c @@ -18,7 +18,7 @@ static char *mystrip(char *str); #include "menu.h" #include "emu.h" -#include +#include extern menu_entry opt_entries[]; extern menu_entry opt2_entries[]; diff --git a/common/emu.c b/common/emu.c index eaabe08..73ca01b 100644 --- a/common/emu.c +++ b/common/emu.c @@ -17,9 +17,9 @@ #include "config.h" #include "common.h" -#include -#include -#include +#include +#include +#include #include diff --git a/common/menu.c b/common/menu.c index 169b892..1becb83 100644 --- 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 #include -#include -#include +#include +#include void SekStepM68k(void); diff --git a/common/mp3_helix.c b/common/mp3_helix.c index f28abda..718c3de 100644 --- a/common/mp3_helix.c +++ b/common/mp3_helix.c @@ -6,8 +6,8 @@ #include #include -#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 --- a/gp2x/940ctl.c +++ b/gp2x/940ctl.c @@ -18,9 +18,9 @@ #include "../common/arm_utils.h" #include "../common/menu.h" #include "../common/emu.h" -#include "../../Pico/PicoInt.h" -#include "../../Pico/sound/ym2612.h" -#include "../../Pico/sound/mix.h" +#include "../../pico/pico_int.h" +#include "../../pico/sound/ym2612.h" +#include "../../pico/sound/mix.h" /* we will need some gp2x internals here */ extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */ diff --git a/gp2x/Makefile b/gp2x/Makefile index 06761a3..b8bf448 100644 --- a/gp2x/Makefile +++ b/gp2x/Makefile @@ -64,54 +64,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla # Pico ifeq "$(amalgamate)" "1" -OBJS += ../../PicoAll.o +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/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 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 - -# asm stuff -ifeq "$(asm_render)" "1" -DEFINC += -D_ASM_DRAW_C -OBJS += Pico/draw_asm.o Pico/draw2_asm.o -endif -ifeq "$(asm_memory)" "1" -DEFINC += -D_ASM_MEMORY_C -OBJS += Pico/memory_asm.o -endif -ifeq "$(asm_ym2612)" "1" -DEFINC += -D_ASM_YM2612_C -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 -endif -ifeq "$(asm_cdpico)" "1" -DEFINC += -D_ASM_CD_PICO_C -OBJS += Pico/cd/pico_asm.o -endif -ifeq "$(asm_cdmemory)" "1" -DEFINC += -D_ASM_CD_MEMORY_C -OBJS += Pico/cd/memory_asm.o -endif +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 # 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_arm.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 @@ -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 # debug ifeq "$(debug_cyclone)" "1" -OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o +OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o endif # CPU cores ifeq "$(use_musashi)" "1" @@ -142,12 +115,14 @@ endif vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. -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/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80 all: mkdirs PicoDrive.gpe +include ../common/common_arm.mak + PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @echo ">>>" $@ $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map @@ -158,22 +133,14 @@ endif up: PicoDrive.gpe @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/ -# @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) # don't clean, gcda may be there -# @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean - readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ GP2X -include ../common/common_arm.mak - # ----------- release ----------- ifneq ($(findstring rel,$(MAKECMDGOALS)),) ifeq ($(VER),) diff --git a/gp2x/emu.c b/gp2x/emu.c index dc78521..77bd83e 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -24,9 +24,9 @@ #include "../common/config.h" #include "cpuctrl.h" -#include -#include -#include +#include +#include +#include #include //#define PFRAMES diff --git a/gp2x/menu.c b/gp2x/menu.c index b7bd3f1..e37c878 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -20,8 +20,8 @@ #include "../common/readpng.h" #include "version.h" -#include -#include +#include +#include #include #ifndef _DIRENT_HAVE_D_TYPE diff --git a/linux/940ctl_ym2612.c b/linux/940ctl_ym2612.c index b6b593a..9d7e38d 100644 --- a/linux/940ctl_ym2612.c +++ b/linux/940ctl_ym2612.c @@ -8,13 +8,13 @@ #include #include -#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 --- 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 --- a/pandora/Makefile +++ b/pandora/Makefile @@ -41,9 +41,10 @@ endif ifeq "$(profile)" "2" COPT_COMMON += -fprofile-use endif -COPT = $(COPT_COMMON) -ASOPT = -GCC = $(CROSS)gcc +CFLAGS = $(COPT_COMMON) +SFLAGS = $(CFLAGS) +ASFLAGS = -mcpu=cortex-a8 +CC = $(CROSS)gcc STRIP = $(CROSS)strip AS = $(CROSS)as LD = $(CROSS)ld @@ -58,54 +59,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla # Pico ifeq "$(amalgamate)" "1" -OBJS += ../../PicoAll.o +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/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 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 - -# asm stuff -ifeq "$(asm_render)" "1" -DEFINC += -D_ASM_DRAW_C -OBJS += Pico/draw_asm.o Pico/draw2_asm.o -endif -ifeq "$(asm_memory)" "1" -DEFINC += -D_ASM_MEMORY_C -OBJS += Pico/memory_asm.o -endif -ifeq "$(asm_ym2612)" "1" -DEFINC += -D_ASM_YM2612_C -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 -endif -ifeq "$(asm_cdpico)" "1" -DEFINC += -D_ASM_CD_PICO_C -OBJS += Pico/cd/pico_asm.o -endif -ifeq "$(asm_cdmemory)" "1" -DEFINC += -D_ASM_CD_MEMORY_C -OBJS += Pico/cd/memory_asm.o -endif +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 # 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_arm.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 @@ -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 # debug ifeq "$(debug_cyclone)" "1" -OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o +OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o endif # CPU cores ifeq "$(use_musashi)" "1" @@ -145,99 +119,29 @@ endif vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. -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/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80 all: mkdirs PicoDrive +include ../common/common_arm.mak + PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @echo ">>>" $@ - $(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng + $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map # -lpng ifeq ($(DEBUG),) $(STRIP) $@ endif - -# cleanup clean: tidy $(RM) PicoDrive tidy: $(RM) $(OBJS) -# rm -rf $(DIRS) # don't clean, gcda may be there -# @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 ">>>" $< - $(GCC) $(COPT) $(DEFINC) -c $< -o $@ -.s.o: - @echo ">>>" $< - $(GCC) $(COPT) $(DEFINC) -c $< -o $@ -.S.o: - @echo ">>>" $< - $(GCC) $(COPT) $(DEFINC) -c $< -o $@ - -Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c - -Pico/draw_asm.o : ../../Pico/Draw.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ -Pico/draw2_asm.o : ../../Pico/Draw2.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ -Pico/memory_asm.o : ../../Pico/Memory.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ -Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ -Pico/sound/mix_asm.o : ../../Pico/sound/mix.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -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 $@ -Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ -Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s - @echo ">>>" $< - $(AS) $(ASOPT) $< -o $@ - -# 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 - -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/$(CROSS)helix-mp3.a: - make -C ../common/helix clean all readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ GP2X -../../tools/textfilter: ../../tools/textfilter.c - make -C ../../tools/ textfilter - - # ----------- release ----------- ifneq ($(findstring rel,$(MAKECMDGOALS)),) $(error TODO) diff --git a/pandora/emu.c b/pandora/emu.c index 0c6935b..1d0b33b 100644 --- a/pandora/emu.c +++ b/pandora/emu.c @@ -24,9 +24,9 @@ #include "../common/common.h" #include "asm_utils.h" -#include -#include -#include +#include +#include +#include #include //#define PFRAMES @@ -294,8 +294,8 @@ static int EmuScanEnd16(unsigned int num) len = 256; } - if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) - mask=0x3f; // accurate sprites, upper bits are priority stuff + if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI)) + mask=0x3f; // messed sprites, upper bits are priority stuff #if 1 clut_line(pd, ps, pal, (mask<<16) | len); @@ -775,6 +775,11 @@ void emu_forcedFrame(int opts) currentConfig.EmuOpt = eo_old; } +void emu_platformDebugCat(char *str) +{ + // nothing +} + static void simpleWait(int thissec, int lim_time) { struct timeval tval; diff --git a/psp/Makefile b/psp/Makefile index 21b2d6a..1d6b673 100644 --- a/psp/Makefile +++ b/psp/Makefile @@ -10,7 +10,7 @@ for_15fw = 1 # :!touch platform/psp/psp.c -CFLAGS += -I../.. -I. -DNO_SYNC +CFLAGS += -I../.. -I. -DNO_SYNC -D_ASM_DRAW_C_AMIPS CFLAGS += -Wall -Winline -G0 #CFLAGS += -DLPRINTF_STDIO #CFLAGS += -pg @@ -32,28 +32,28 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla # Pico ifeq "$(amalgamate)" "1" -OBJS += ../../PicoAll.o +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 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/draw_amips.o pico/memory_amips.o \ + pico/misc_amips.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 - 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 \ @@ -81,7 +81,7 @@ 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 \ +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 @@ -125,23 +125,19 @@ cpu/fame/famec.o : ../../cpu/fame/famec.c @echo ">>>" $< $(CC) $(CFLAGS) -Wno-unused -c $< -o $@ -Pico/Memory.o : ../../Pico/Memory.c +pico/misc.o : ../../pico/misc.c @echo ">>>" $< - $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS - -Pico/cd/Memory.o : ../../Pico/cd/Memory.c - @echo ">>>" $< - $(CC) $(CFLAGS) -O2 -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS -Pico/Draw.o : ../../Pico/Draw.c +pico/memory.o : ../../pico/memory.c @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS + $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS -Pico/Misc.o : ../../Pico/Misc.c +pico/cd/memory.o : ../../pico/cd/memory.c @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS + $(CC) $(CFLAGS) -O2 -c $< -o $@ -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 $@ diff --git a/psp/emu.c b/psp/emu.c index 5c87355..91bd563 100644 --- 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 +#include #define OSD_FPS_X 432 diff --git a/psp/menu.c b/psp/menu.c index 0e578b1..6fe06ae 100644 --- a/psp/menu.c +++ b/psp/menu.c @@ -27,8 +27,8 @@ #include "../common/lprintf.h" #include "version.h" -#include -#include +#include +#include #include diff --git a/psp/mp3.c b/psp/mp3.c index 19f6ec3..c1e6089 100644 --- a/psp/mp3.c +++ b/psp/mp3.c @@ -11,8 +11,8 @@ #include #include -#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; -- 2.39.5