X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=268d1ee9128ed03b6cf67b1b39f7b231b918561f;hb=ddf193afa41762a7b363610ecd3ddd82be9fc4db;hp=32cfd0fced874938134a68bca52a8202d6f0958c;hpb=bb895563088da093a90f42fc6a532688adc36cf2;p=gbajam22

diff --git a/Makefile b/Makefile
index 32cfd0f..268d1ee 100644
--- 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
@@ -100,7 +103,7 @@ run: $(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