1 files changed, 14 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 100c861..8da65eb 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,16 +30,13 @@ 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
 ARCH           := -mthumb -mthumb-interwork
 SPECS          := -specs=gba.specs
 CONFIG         :=
-CFLAGS         := -Wall -Wextra -pedantic -Wno-incompatible-pointer-types
+CFLAGS         := -Wall -Wextra -pedantic -Wno-incompatible-pointer-types -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter
 CFLAGS         += -fno-strict-aliasing
 CFLAGS         += -mcpu=arm7tdmi -mtune=arm7tdmi $(ARCH)
 CFLAGS         += $(INC_FLAGS)
@@ -62,17 +60,23 @@ endif
 
 main: $(BUILD_DIR) $(ROM) $(BIN)
 
-$(ROM): $(TOOLS_BIN2CARR)
-        ./tools/bin2carr/build/bin2carr -n uxn_rom -e u16 -o $(ROM) $(ROM_SRC)
+# Creates the rom object file from the given UXN_ROM.
+$(ROM_FILE):
+        cp $(UXN_ROM) $(ROM_FILE)
+
+$(ROM_OBJ): $(ROM_FILE)
+        $(OBJCOPY) --rename-section .data=.rodata \
+                -I binary -O elf32-littlearm $(ROM_FILE) $(ROM_OBJ)
 
 # Strip and fix header to create final .gba file.
 $(BIN): $(ELF)
         $(OBJCOPY) -v -O binary $(ELF) $(BIN)
         $(DEVKITTOOLS)/gbafix $(BIN)
+        rm $(ROM_FILE)
 
 # Link files.
-$(ELF): $(SRC_MAIN) $(WATCH_SRC)
-        $(CC) $(CFLAGS) $(LDFLAGS) -o $(ELF) $(SRC_MAIN) $(ASM_FILES) $(LDLIBS)
+$(ELF): $(SRC_MAIN) $(WATCH_SRC) $(ROM_OBJ) | $(BUILD_DIR)
+        $(CC) $(CFLAGS) $(LDFLAGS) -o $(ELF) $(SRC_MAIN) $(ASM_FILES) $(LDLIBS) $(ROM_OBJ)
 
 # Create build directory if needed.
 $(BUILD_DIR):
@@ -85,6 +89,3 @@ run: main
 # Remove build directory.
 clean:
         rm -rf $(BUILD_DIR)
-
-$(TOOLS_BIN2CARR):
-        make -C tools/bin2carr