Fix k mode instructions

1 files changed, 9 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 4e5bab3..ac6f24d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ LIBGBA      += $(LIBGBA_DIR)/lib/libmm.a
 SRC_DIR     := src
 BUILD_DIR   := build
 SRC_MAIN    := $(SRC_DIR)/main.c
-ROM         := $(BUILD_DIR)/rom.c
-ROM_SRC     := roms/dvd.rom
+UXN_ROM     := roms/dvd.rom
+ROM_FILE    := $(BUILD_DIR)/uxn.rom
+ROM_OBJ     := $(BUILD_DIR)/rom.o
 ASM_FILES   := $(wildcard $(SRC_DIR)/*.s)
 WATCH_SRC   := $(shell find $(SRC_DIR) -name *.c -or -name *.s -or -name *.h)
 INC_DIRS    := $(shell find $(SRC_DIR) -type d)
@@ -29,9 +30,6 @@ TARGET         := uxngba
 ELF            := $(BUILD_DIR)/$(TARGET).elf
 BIN            := $(BUILD_DIR)/$(TARGET).gba
 
-# Target tools.
-TOOLS_BIN2CARR := tools/bin2carr/build/bin2carr
-
 # Compiler and linker configuration.
 CC             := $(DEVKITBIN)/arm-none-eabi-gcc
 OBJCOPY        := $(DEVKITBIN)/arm-none-eabi-objcopy
@@ -63,7 +61,7 @@ endif
 main: $(BUILD_DIR) $(ROM) $(BIN)
 
 $(ROM): $(TOOLS_BIN2CARR)
-        ./tools/bin2carr/build/bin2carr -n uxn_rom -e u8 -o $(ROM) $(ROM_SRC)
+        ./tools/bin2carr/build/bin2carr -n uxn_rom -e u8 -o $(ROM) $(UXN_ROM)
 
 # Strip and fix header to create final .gba file.
 $(BIN): $(ELF)
@@ -71,8 +69,11 @@ $(BIN): $(ELF)
         $(DEVKITTOOLS)/gbafix $(BIN)
 
 # Link files.
-$(ELF): $(SRC_MAIN) $(WATCH_SRC)
-        $(CC) $(CFLAGS) $(LDFLAGS) -o $(ELF) $(SRC_MAIN) $(ASM_FILES) $(LDLIBS)
+$(ELF): $(SRC_MAIN) $(WATCH_SRC) | $(BUILD_DIR)
+        cp $(UXN_ROM) $(ROM_FILE)
+        $(OBJCOPY) --rename-section .data=.rodata \
+                -I binary -O elf32-littlearm $(ROM_FILE) $(ROM_OBJ)
+        $(CC) $(CFLAGS) $(LDFLAGS) -o $(ELF) $(SRC_MAIN) $(ASM_FILES) $(LDLIBS) $(ROM_OBJ)
 
 # Create build directory if needed.
 $(BUILD_DIR):
@@ -85,6 +86,3 @@ run: main
 # Remove build directory.
 clean:
         rm -rf $(BUILD_DIR)
-
-$(TOOLS_BIN2CARR):
-        make -C tools/bin2carr