From 351f90da417a3fc57c677e0c487ed2fc95278f65 Mon Sep 17 00:00:00 2001 From: Jaby Date: Tue, 29 Nov 2022 03:28:42 +0100 Subject: [PATCH] Call which will be a overlay later --- lib/Makefile | 4 ++-- src/Library/src/BootLoader/start_boot.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 5ec5936c..cd717a6c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -37,7 +37,7 @@ LD = $(CXX) AR = ar #architecture flags -ARCHFLAGS = -march=mips1 -mabi=32 -EL -fno-pic -mno-shared -mno-abicalls -mfp32 +ARCHFLAGS = -march=mips1 -mabi=32 -EL -fno-pic -mno-shared -nostdinc -nostdinc++ -mno-abicalls -mfp32 ARCHFLAGS += -fno-stack-protector -nostdlib -ffreestanding #Compiler flags for build profiles @@ -56,7 +56,7 @@ CCFLAGS += -std=c++20 CCFLAGS += $(ARCHFLAGS) CCFLAGS += $(CCFLAGS_$(BUILD_PROFILE)) - +CCFLAGS += $(INCLUDES) CCFLAGS += -DJABYENGINE_$(TV_FORMAT) #Linker flags diff --git a/src/Library/src/BootLoader/start_boot.cpp b/src/Library/src/BootLoader/start_boot.cpp index 7ebb595d..641d115d 100644 --- a/src/Library/src/BootLoader/start_boot.cpp +++ b/src/Library/src/BootLoader/start_boot.cpp @@ -2,6 +2,8 @@ #include #include +extern int main(); + namespace JabyEngine { static void enable_DMA() { DMA::DPCR.write(DMA::DPCR.read() | DMA::DMAControlRegister::SPUEnable | DMA::DMAControlRegister::GPUEnable); @@ -19,5 +21,7 @@ namespace JabyEngine { SPU::setup(); printf("Setup done!\n"); + + main(); } } \ No newline at end of file