RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lowercasing filenames, part1; makefile adjustments

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@574 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-08-28 12:21:04 +00:00
parent 8611d1242e
commit f11bad75ed
17 changed files with 146 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

69
common/common_arm.mak
View file

@ -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: .c.o:
@echo ">>>" $< @echo ">>>" $<
$(CC) $(CFLAGS) $(DEFINC) -c $< -o $@ $(CC) $(CFLAGS) $(DEFINC) -c $< -o $@
@ -18,47 +46,18 @@ mkdirs:
mkdir -p $(DIRS) mkdir -p $(DIRS)
# deps # deps
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/Pico.o Pico/cd/Pico.o : ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.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 $@
# build Cyclone # build Cyclone
cpu/Cyclone/proj/Cyclone.s: cpu/Cyclone/proj/Cyclone.s:
@echo building Cyclone... @echo building Cyclone...
@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
../../cpu/musashi/m68kops.c :
@make -C ../../cpu/musashi
# build helix libs # build helix libs
../common/helix/$(CROSS)helix-mp3.a: ../common/helix/$(CROSS)helix-mp3.a:
make -C ../common/helix clean all make -C ../common/helix clean all

2
common/config.c
View file

@ -18,7 +18,7 @@ static char *mystrip(char *str);
#include "menu.h" #include "menu.h"
#include "emu.h" #include "emu.h"
#include <Pico/Pico.h> #include <pico/pico.h>
extern menu_entry opt_entries[]; extern menu_entry opt_entries[];
extern menu_entry opt2_entries[]; extern menu_entry opt2_entries[];

6
common/emu.c
View file

@ -17,9 +17,9 @@
#include "config.h" #include "config.h"
#include "common.h" #include "common.h"
#include <Pico/PicoInt.h> #include <pico/pico_int.h>
#include <Pico/Patch.h> #include <pico/patch.h>
#include <Pico/cd/cue.h> #include <pico/cd/cue.h>
#include <zlib/zlib.h> #include <zlib/zlib.h>

4
common/menu.c
View file

@ -338,8 +338,8 @@ int me_process(menu_entry *entries, int count, menu_id id, int is_next)
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <Pico/Pico.h> #include <pico/pico.h>
#include <Pico/Debug.h> #include <pico/debug.h>
void SekStepM68k(void); void SekStepM68k(void);

4
common/mp3_helix.c
View file

@ -6,8 +6,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "../../Pico/PicoInt.h" #include "../../pico/pico_int.h"
#include "../../Pico/sound/mix.h" #include "../../pico/sound/mix.h"
#include "helix/pub/mp3dec.h" #include "helix/pub/mp3dec.h"
#include "lprintf.h" #include "lprintf.h"

6
gp2x/940ctl.c
View file

@ -18,9 +18,9 @@
#include "../common/arm_utils.h" #include "../common/arm_utils.h"
#include "../common/menu.h" #include "../common/menu.h"
#include "../common/emu.h" #include "../common/emu.h"
#include "../../Pico/PicoInt.h" #include "../../pico/pico_int.h"
#include "../../Pico/sound/ym2612.h" #include "../../pico/sound/ym2612.h"
#include "../../Pico/sound/mix.h" #include "../../pico/sound/mix.h"
/* we will need some gp2x internals here */ /* we will need some gp2x internals here */
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */ extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */

65
gp2x/Makefile
View file

@ -64,54 +64,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
# Pico # Pico
ifeq "$(amalgamate)" "1" ifeq "$(amalgamate)" "1"
OBJS += ../../PicoAll.o OBJS += ../../picoAll.o
else else
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.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/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.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/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/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
endif endif
# Pico - Pico # 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 # Pico - carthw
OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.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 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
# Pico - sound # Pico - sound
ifneq "$(amalgamate)" "1" ifneq "$(amalgamate)" "1"
OBJS += Pico/sound/sound.o OBJS += pico/sound/sound.o
endif endif
OBJS += Pico/sound/mix_asm.o OBJS += pico/sound/mix_arm.o
OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
# zlib # zlib
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.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/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 OBJS += unzip/unzip.o unzip/unzip_stream.o
# debug # debug
ifeq "$(debug_cyclone)" "1" ifeq "$(debug_cyclone)" "1"
OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
endif endif
# CPU cores # CPU cores
ifeq "$(use_musashi)" "1" ifeq "$(use_musashi)" "1"
@ -142,12 +115,14 @@ endif
vpath %.c = ../.. vpath %.c = ../..
vpath %.s = ../.. vpath %.s = ../..
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 zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
all: mkdirs PicoDrive.gpe all: mkdirs PicoDrive.gpe
include ../common/common_arm.mak
PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@ @echo ">>>" $@
$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map
@ -158,22 +133,14 @@ endif
up: PicoDrive.gpe up: PicoDrive.gpe
@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/ @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 clean: tidy
$(RM) PicoDrive.gpe $(RM) PicoDrive.gpe
tidy: tidy:
$(RM) $(OBJS) $(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 readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X ../../tools/textfilter ../base_readme.txt $@ GP2X
include ../common/common_arm.mak
# ----------- release ----------- # ----------- release -----------
ifneq ($(findstring rel,$(MAKECMDGOALS)),) ifneq ($(findstring rel,$(MAKECMDGOALS)),)
ifeq ($(VER),) ifeq ($(VER),)

6
gp2x/emu.c
View file

@ -24,9 +24,9 @@
#include "../common/config.h" #include "../common/config.h"
#include "cpuctrl.h" #include "cpuctrl.h"
#include <Pico/PicoInt.h> #include <pico/pico_int.h>
#include <Pico/Patch.h> #include <pico/patch.h>
#include <Pico/sound/mix.h> #include <pico/sound/mix.h>
#include <zlib/zlib.h> #include <zlib/zlib.h>
//#define PFRAMES //#define PFRAMES

4
gp2x/menu.c
View file

@ -20,8 +20,8 @@
#include "../common/readpng.h" #include "../common/readpng.h"
#include "version.h" #include "version.h"
#include <Pico/PicoInt.h> #include <pico/pico_int.h>
#include <Pico/Patch.h> #include <pico/patch.h>
#include <zlib/zlib.h> #include <zlib/zlib.h>
#ifndef _DIRENT_HAVE_D_TYPE #ifndef _DIRENT_HAVE_D_TYPE

4
linux/940ctl_ym2612.c
View file

@ -8,13 +8,13 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "../../Pico/sound/ym2612.h" #include "../../pico/sound/ym2612.h"
#include "../gp2x/gp2x.h" #include "../gp2x/gp2x.h"
#include "../gp2x/emu.h" #include "../gp2x/emu.h"
#include "../gp2x/menu.h" #include "../gp2x/menu.h"
#include "../gp2x/code940/940shared.h" #include "../gp2x/code940/940shared.h"
#include "../common/helix/pub/mp3dec.h" #include "../common/helix/pub/mp3dec.h"
#include "../../Pico/PicoInt.h" #include "../../pico/pico_int.h"
// static _940_data_t shared_data_; // static _940_data_t shared_data_;

31
linux/Makefile
View file

@ -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 platform/common/readpng.o platform/common/mp3_helix.o
# Pico # Pico
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.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/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.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/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/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
# Pico - Pico # 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 # 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 # Pico - carthw
OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.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/ssp16.o pico/carthw/svp/compiler.o
# zlib # zlib
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.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 zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
@ -73,13 +73,14 @@ endif
# misc # misc
ifeq "$(use_fame)" "1" ifeq "$(use_fame)" "1"
ifeq "$(use_musashi)" "1" ifeq "$(use_musashi)" "1"
OBJS += Pico/DebugCPU.o OBJS += pico/debugCPU.o
OBJS += cpu/musashi/m68kdasm.o OBJS += cpu/musashi/m68kdasm.o
endif endif
endif endif
OBJS += cpu/musashi/m68kdasm.o
vpath %.c = ../.. 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 zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
all: mkdirs PicoDrive all: mkdirs PicoDrive
@ -98,9 +99,9 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
mkdirs: mkdirs:
mkdir -p $(DIRS) mkdir -p $(DIRS)
Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/gen_arm.c 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/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
../../cpu/musashi/m68kops.c : ../../cpu/musashi/m68kops.c :
@make -C ../../cpu/musashi @make -C ../../cpu/musashi
@ -123,7 +124,7 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
$(GCC) $(COPT) $(DEFINC) -c $< -o $@ $(GCC) $(COPT) $(DEFINC) -c $< -o $@
Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c pico/sound/ym2612.o : ../../pico/sound/ym2612.c
@echo ">>>" $@ @echo ">>>" $@
$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ $(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@

138
pandora/Makefile
View file

@ -41,9 +41,10 @@ endif
ifeq "$(profile)" "2" ifeq "$(profile)" "2"
COPT_COMMON += -fprofile-use COPT_COMMON += -fprofile-use
endif endif
COPT = $(COPT_COMMON) CFLAGS = $(COPT_COMMON)
ASOPT = SFLAGS = $(CFLAGS)
GCC = $(CROSS)gcc ASFLAGS = -mcpu=cortex-a8
CC = $(CROSS)gcc
STRIP = $(CROSS)strip STRIP = $(CROSS)strip
AS = $(CROSS)as AS = $(CROSS)as
LD = $(CROSS)ld LD = $(CROSS)ld
@ -58,54 +59,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
# Pico # Pico
ifeq "$(amalgamate)" "1" ifeq "$(amalgamate)" "1"
OBJS += ../../PicoAll.o OBJS += ../../picoAll.o
else else
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.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/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.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/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/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
endif endif
# Pico - Pico # 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 # Pico - carthw
OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.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 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
# Pico - sound # Pico - sound
ifneq "$(amalgamate)" "1" ifneq "$(amalgamate)" "1"
OBJS += Pico/sound/sound.o OBJS += pico/sound/sound.o
endif endif
OBJS += Pico/sound/mix_asm.o OBJS += pico/sound/mix_arm.o
OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
# zlib # zlib
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.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/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 OBJS += unzip/unzip.o unzip/unzip_stream.o
# debug # debug
ifeq "$(debug_cyclone)" "1" ifeq "$(debug_cyclone)" "1"
OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
endif endif
# CPU cores # CPU cores
ifeq "$(use_musashi)" "1" ifeq "$(use_musashi)" "1"
@ -145,99 +119,29 @@ endif
vpath %.c = ../.. vpath %.c = ../..
vpath %.s = ../.. vpath %.s = ../..
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 zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
all: mkdirs PicoDrive all: mkdirs PicoDrive
include ../common/common_arm.mak
PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@ @echo ">>>" $@
$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
ifeq ($(DEBUG),) ifeq ($(DEBUG),)
$(STRIP) $@ $(STRIP) $@
endif endif
# cleanup
clean: tidy clean: tidy
$(RM) PicoDrive $(RM) PicoDrive
tidy: tidy:
$(RM) $(OBJS) $(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 readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X ../../tools/textfilter ../base_readme.txt $@ GP2X
../../tools/textfilter: ../../tools/textfilter.c
make -C ../../tools/ textfilter
# ----------- release ----------- # ----------- release -----------
ifneq ($(findstring rel,$(MAKECMDGOALS)),) ifneq ($(findstring rel,$(MAKECMDGOALS)),)
$(error TODO) $(error TODO)

15
pandora/emu.c
View file

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

54
psp/Makefile
View file

@ -10,7 +10,7 @@ for_15fw = 1
# :!touch platform/psp/psp.c # :!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 += -Wall -Winline -G0
#CFLAGS += -DLPRINTF_STDIO #CFLAGS += -DLPRINTF_STDIO
#CFLAGS += -pg #CFLAGS += -pg
@ -32,28 +32,28 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
# Pico # Pico
ifeq "$(amalgamate)" "1" ifeq "$(amalgamate)" "1"
OBJS += ../../PicoAll.o OBJS += ../../picoAll.o
else else
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o Pico/VideoPort.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/draw2.o pico/draw.o pico/patch.o pico/draw_amips.o pico/memory_amips.o \
Pico/Misc_amips.o Pico/Debug.o pico/misc_amips.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.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/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/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
# Pico - carthw # Pico - carthw
OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \ OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
Pico/carthw/svp/ssp16.o pico/carthw/svp/ssp16.o
# Pico - Pico # 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 endif
# Pico - sound # Pico - sound
ifneq "$(amalgamate)" "1" ifneq "$(amalgamate)" "1"
OBJS += Pico/sound/sound.o OBJS += pico/sound/sound.o
endif endif
OBJS += Pico/sound/mix.o OBJS += pico/sound/mix.o
OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
# zlib (hacked) # zlib (hacked)
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.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/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 %.c = ../..
vpath %.s = ../.. 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 zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
@ -125,23 +125,19 @@ cpu/fame/famec.o : ../../cpu/fame/famec.c
@echo ">>>" $< @echo ">>>" $<
$(CC) $(CFLAGS) -Wno-unused -c $< -o $@ $(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 $@
Pico/Draw.o : ../../Pico/Draw.c
@echo ">>>" $<
$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS
Pico/Misc.o : ../../Pico/Misc.c
@echo ">>>" $< @echo ">>>" $<
$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS
Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.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
@echo ">>>" $<
$(CC) $(CFLAGS) -O2 -c $< -o $@
pico/cd/gfx_cd.o : ../../pico/cd/gfx_cd.c
@echo ">>>" $< @echo ">>>" $<
$(CC) $(CFLAGS) -O2 -c $< -o $@ $(CC) $(CFLAGS) -O2 -c $< -o $@

4
psp/emu.c
View file

@ -21,8 +21,8 @@
#include "../common/emu.h" #include "../common/emu.h"
#include "../common/config.h" #include "../common/config.h"
#include "../common/lprintf.h" #include "../common/lprintf.h"
#include "../../Pico/PicoInt.h" #include <pico/pico_int.h>
#include "../../Pico/cd/cue.h" #include <pico/cd/cue.h>
#define OSD_FPS_X 432 #define OSD_FPS_X 432

4
psp/menu.c
View file

@ -27,8 +27,8 @@
#include "../common/lprintf.h" #include "../common/lprintf.h"
#include "version.h" #include "version.h"
#include <Pico/PicoInt.h> #include <pico/pico_int.h>
#include <Pico/Patch.h> #include <pico/patch.h>
#include <zlib/zlib.h> #include <zlib/zlib.h>

4
psp/mp3.c
View file

@ -11,8 +11,8 @@
#include <pspaudiocodec.h> #include <pspaudiocodec.h>
#include <kubridge.h> #include <kubridge.h>
#include "../../Pico/PicoInt.h" #include "../../pico/pico_int.h"
#include "../../Pico/sound/mix.h" #include "../../pico/sound/mix.h"
#include "../common/lprintf.h" #include "../common/lprintf.h"
int mp3_last_error = 0; int mp3_last_error = 0;