From 9f4891f95070c66ea9f1aba99d72724d4ab24e5a Mon Sep 17 00:00:00 2001 From: "John Wilbert M. Villamor" Date: Sat, 19 Sep 2020 20:43:05 +0800 Subject: Revised makefiles, added strtok(), command line arguments, SetHeapSize(), moved ISR and callback system to psxetc, moved debug font to psxgpu, fixed CD-ROM library crashing on PSIO, fixed interrupt callback setup to fix crashing on ResetGraph() --- examples/cdrom/cdxa/main.c | 7 +++---- examples/cdrom/cdxa/makefile | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'examples/cdrom/cdxa') diff --git a/examples/cdrom/cdxa/main.c b/examples/cdrom/cdxa/main.c index 55cb508..0112437 100644 --- a/examples/cdrom/cdxa/main.c +++ b/examples/cdrom/cdxa/main.c @@ -235,14 +235,13 @@ void init() { int i; + /* Uncomment to direct tty messages to serial */ + //AddSIO(115200); + /* Reset GPU (also installs event handler for VSync) */ printf("Init GPU... "); ResetGraph( 0 ); printf("Done.\n"); - - - /* Uncomment to direct tty messages to serial */ - AddSIO(115200); /* Initialize SPU and CD-ROM */ diff --git a/examples/cdrom/cdxa/makefile b/examples/cdrom/cdxa/makefile index 8858979..3e46301 100644 --- a/examples/cdrom/cdxa/makefile +++ b/examples/cdrom/cdxa/makefile @@ -1,4 +1,4 @@ -include ../../sdk-common.mk +include ../../examples-setup.mk TARGET = cdxa.elf @@ -10,7 +10,7 @@ OFILES = $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o) PREFIX = mipsel-unknown-elf- -LIBS = -lpsxcd -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxsio -lpsxapi -lc +LIBS = -lpsxcd -lpsxgpu -lpsxgte -lpsxspu -lpsxsio -lpsxetc -lpsxapi -lc CFLAGS = -g -O2 -fno-builtin -fdata-sections -ffunction-sections CPPFLAGS = $(CFLAGS) \ -- cgit v1.2.3