looks right, extremely slow

[gbajam22] / Makefile

diff --git a/Makefile b/Makefile
index 32cfd0f..025fa8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 src = $(wildcard src/*.c) $(wildcard src/gba/*.c)
-ssrc = $(wildcard src/gba/*.s) data/lut.s
+ssrc = $(wildcard src/*.s) $(wildcard src/gba/*.s) data/lut.s
 obj = $(src:.c=.arm.o) $(ssrc:.s=.arm.o)
 dep = $(src:.c=.arm.d)
 name = gbajam22
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/color.raw data/color.pal data/height.raw
+
 libs = libs/maxmod/libmm.a
 
 TCPREFIX = arm-none-eabi-
@@ -47,6 +49,7 @@ $(elf): $(obj) $(libs)
        $(AS) -o $@ $(ASFLAGS) $<
 
 src/data.o: src/data.s $(data)
+src/data.arm.o: src/data.s $(data)
 
 tools/pngdump/pngdump:
        $(MAKE) -C tools/pngdump
@@ -95,12 +98,12 @@ install: $(bin)
 
 .PHONY: run
 run: $(bin)
-       mgba -2 $(bin)
+       mgba -3 $(bin)
 
 .PHONY: debug
 debug: $(elf)
        mgba -2 -g $(bin) &
-       $(TCPREFIX)gdb $<
+       $(TCPREFIX)gdb -x gdbmgba $<
 
 .PHONY: disasm
 disasm: $(elf)
@@ -111,3 +114,8 @@ libs: $(libs)
 
 libs/maxmod/libmm.a:
        $(MAKE) -C libs/maxmod
+
+
+.PHONY: pc
+pc:
+       $(MAKE) -f Makefile.pc