tunnel

[gbajam21] / Makefile

diff --git a/Makefile b/Makefile
index a0281a9..bf91267 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ name = gbajam21
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/tuncross.raw data/tuncross.pal \
+          data/tun.map
+
 audata = data/audio/popcorn.mod
 dataobj = data/aas_data.o
 
@@ -21,7 +24,7 @@ OBJDUMP = $(TCPREFIX)objdump
 EMU = vbam
 
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
-#dbg = -g
+dbg = -g
 inc = -I. -Ilibs/aas
 
 CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
@@ -43,12 +46,17 @@ $(elf): data/aas_data.h $(obj) $(libs)
 
 -include $(dep)
 
+src/data.o: src/data.s $(data)
+
 tools/pngdump/pngdump:
        $(MAKE) -C tools/pngdump
 
 tools/conv2aas/conv2aas:
        $(MAKE) -C tools/conv2aas
 
+tools/tungen: tools/tungen.c
+       cc -o $@ $< -lm
+
 #data/sprites.raw: data/sprites1.png data/sprites2.png data/sprites3.png data/sprites4.png data/sprites5.png data/sprites6.png
 #      tools/pngdump/pngdump -o $@ -n $^
 
@@ -58,6 +66,9 @@ tools/conv2aas/conv2aas:
 %.pal: %.png tools/pngdump/pngdump
        tools/pngdump/pngdump -o $@ -c $<
 
+data/tun.map: tools/tungen
+       tools/tungen -s 240x160 >$@
+
 data/aas_data.h: data/aas_data.s
 
 data/aas_data.s: $(audata) tools/conv2aas/conv2aas
@@ -85,7 +96,12 @@ run: $(bin_mb)
 
 .PHONY: simrun
 simrun: $(bin)
-       $(EMU) $(EMUFLAGS) $(bin)
+       mgba -2 $(bin)
+
+.PHONY: debug
+debug: $(elf)
+       mgba -2 -g $(bin) &
+       $(TCPREFIX)gdb $<
 
 .PHONY: disasm
 disasm: $(elf)