Fix gitignore removing bin file from arm9/include

* Also commented out exception stub from make file...it doesn't appear
to be used by anything and it won't compile for me presently anyways.
This commit is contained in:
ApacheThunder 2024-10-30 00:08:47 -05:00
parent 3514acacee
commit 20efa561bc
5 changed files with 26 additions and 13 deletions

3
.gitignore vendored
View File

@ -3,13 +3,14 @@
*.NDS *.NDS
*.nds *.nds
*.elf *.elf
*.bin
*.bz2 *.bz2
*.dsi *.dsi
*.cia *.cia
*.zip *.zip
*.app
BootStrap/arm7/build BootStrap/arm7/build
BootStrap/arm9/build BootStrap/arm9/build
BootStrap/*.bin
data data
build build
hbmenu hbmenu

View File

@ -25,13 +25,23 @@
#include "nds_loader_arm9.h" #include "nds_loader_arm9.h"
int main( int argc, char **argv) {
void DisplayError(bool fatInitFailed) {
consoleDemoInit(); consoleDemoInit();
iprintf("hbmenu bootstrap ...\n"); printf("hbmenu bootstrap ...\n\n");
if (fatInitDefault()) { if (fatInitFailed) {
runNdsFile("/BOOT.NDS", 0, NULL); printf("FAT init failed!\n");
} else { } else {
iprintf("FAT init failed!\n"); printf("Load NDS file Error!\n");
} }
while(1) swiWaitForVBlank();
} }
int main(int argc, char **argv) {
if (fatInitDefault()) {
if (runNdsFile("/BOOT.NDS", 0, NULL) != 0)DisplayError(true);
} else {
DisplayError(false);
}
while(1)swiWaitForVBlank();
}

View File

@ -29,12 +29,14 @@ NITRO_FILES :=
include $(DEVKITARM)/ds_rules include $(DEVKITARM)/ds_rules
.PHONY: data ndsbootloader bootstub BootStrap exceptionstub clean # .PHONY: data ndsbootloader bootstub BootStrap exceptionstub clean
.PHONY: data ndsbootloader bootstub BootStrap clean
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: ndsbootloader bootstub exceptionstub $(TARGET).nds BootStrap # all: ndsbootloader bootstub exceptionstub $(TARGET).nds BootStrap
all: ndsbootloader bootstub $(TARGET).nds BootStrap
cia: cia:
$(MAKE) -C BootStrap bootstrap.cia $(MAKE) -C BootStrap bootstrap.cia
@ -74,8 +76,8 @@ data:
ndsbootloader: data ndsbootloader: data
$(MAKE) -C ndsbootloader LOADBIN=$(CURDIR)/data/load.bin $(MAKE) -C ndsbootloader LOADBIN=$(CURDIR)/data/load.bin
exceptionstub: data # exceptionstub: data
$(MAKE) -C exception-stub STUBBIN=$(CURDIR)/data/exceptionstub.bin # $(MAKE) -C exception-stub STUBBIN=$(CURDIR)/data/exceptionstub.bin
bootstub: data bootstub: data
$(MAKE) -C bootstub $(MAKE) -C bootstub
@ -98,7 +100,7 @@ clean:
$(MAKE) -C ndsbootloader clean $(MAKE) -C ndsbootloader clean
$(MAKE) -C bootstub clean $(MAKE) -C bootstub clean
$(MAKE) -C BootStrap clean $(MAKE) -C BootStrap clean
$(MAKE) -C exception-stub clean # $(MAKE) -C exception-stub clean
rm -rf data rm -rf data
rm -rf hbmenu rm -rf hbmenu
rm -f $(TARGET).nds rm -f $(TARGET).nds

BIN
arm9/include/hbNoIcon.bin Normal file

Binary file not shown.