update makefiles, allow loading files from ./uxn, re-enable NitroFS o…

…n NDS
asiekierka · Dec 16, 2023 · 7fb9120 · 7fb9120
1 parent de13455
commit 7fb9120
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/Makefile.blocksds.arm7 b/Makefile.blocksds.arm7
@@ -73,7 +73,7 @@ SOURCES_CPP	:= $(shell find -L $(SOURCEDIRS) -name "*.cpp")
 
 DEFINES		+= -D__NDS__ -DARM7
 
-ARCH		:= -mcpu=arm7tdmi -mtune=arm7tdmi
+ARCH		:= -mcpu=arm7tdmi
 
 WARNFLAGS	:= -Wall
 
@@ -106,6 +106,7 @@ CXXFLAGS	+= -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(ARCH) \
 LDFLAGS		:= -mthumb -mthumb-interwork $(LIBDIRSFLAGS) \
 		   -Wl,-Map,$(MAP) -Wl,--gc-sections -nostdlib \
 		   -T$(BLOCKSDS)/sys/crts/ds_arm7.ld \
+		   -Wl,--no-warn-rwx-segments \
 		   -Wl,--start-group $(LIBS) -lgcc -Wl,--end-group
 
 # Intermediate build files

diff --git a/Makefile.blocksds.arm9 b/Makefile.blocksds.arm9
@@ -95,7 +95,7 @@ SOURCES_CPP	:= $(shell find -L $(SOURCEDIRS) -maxdepth 1 -name "*.cpp")
 
 DEFINES		+= -D__NDS__ -DARM9 -DBLOCKSDS
 
-ARCH		:= -march=armv5te -mtune=arm946e-s
+ARCH		:= -mcpu=arm946e-s+nofp
 
 WARNFLAGS	:= -Wall
 
@@ -141,6 +141,7 @@ LDFLAGS		:= -Wl,--defsym=vfprintf=__i_vfprintf -Wl,--defsym=vfscanf=__i_vfscanf
 		   -Wl,-Map,$(MAP) -Wl,--gc-sections -nostdlib \
 		   -T$(BLOCKSDS)/sys/crts/ds_arm9.mem \
 		   -T$(BLOCKSDS)/sys/crts/ds_arm9.ld \
+		   -Wl,--no-warn-rwx-segments -Wl,--use-blx \
 		   -Wl,--start-group $(LIBS) -lgcc -Wl,--end-group
 
 # Intermediate build files

diff --git a/arm9/source/emulator.c b/arm9/source/emulator.c
@@ -336,13 +336,17 @@ profiler_ticks(Uint32 tticks, int pos, const char *name)
 static int
 uxn_load_boot(Uxn *u)
 {
-/*	if(system_load(u, "nitro:/boot.rom")) {
+	if(system_load(u, "nitro:/boot.rom")) {
 		chdir("nitro:/");
 		return 1;
-	} */
+	}
 	if(system_load(u, "boot.rom")) {
 		return 1;
 	}
+	if(system_load(u, "./uxn/boot.rom")) {
+		chdir("./uxn");
+		return 1;
+	}
 	if(system_load(u, "/uxn/boot.rom")) {
 		chdir("/uxn");
 		return 1;
@@ -505,7 +509,7 @@ main(int argc, char **argv)
 		return error("Boot", "Failed");
 	if(!fatInitDefault())
 		return error("FAT init", "Failed");
-	// nitroFSInit(NULL); // no big deal if this one fails
+	nitroFSInit(NULL); // no big deal if this one fails
 	if(!uxn_load_boot(&u)) {
                 dprintf("Halted: Missing input rom.\n");
 		return error("Load", "Failed");

diff --git a/source/3ds/emulator.c b/source/3ds/emulator.c
@@ -420,6 +420,10 @@ uxn_load_boot(Uxn *u)
 	if(system_load(u, "boot.rom")) {
 		return 1;
 	}
+	if(system_load(u, "./uxn/boot.rom")) {
+		chdir("./uxn");
+		return 1;
+	}
 	if(system_load(u, "/uxn/boot.rom")) {
 		chdir("/uxn");
 		return 1;