X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=dff14a7d98f92d0e3e1a8066082b2ad1229a429f;hb=8bec66098f3111e4b7c87361fd4142e94dcfeebd;hp=6c173f86b8cf2c520a07f5d43fff01a8e7b07da4;hpb=dc2165689855c0517d30fb10c1b71464e42d8b6b;p=mdlife

diff --git a/Makefile b/Makefile
index 6c173f8..dff14a7 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ bin = $(name).bin
 
 warn = -pedantic -Wall
 dbg = -g
-opt = -O3
+#opt = -O3
 def = -D__NO_CTYPE
 inc = -I. -Isrc -Isrc/libc
 
@@ -51,7 +51,7 @@ disasm: $(elf)
 	$(OBJDUMP) -D $< >$@
 
 src/data-asm.o: src/data.s data/font8x8.img data/cellspr.img data/simbabg.tiles \
-	data/simbafg.tiles
+	data/simbafg.tiles data/simbafg.tmap
 src/z80prog-asm.o: src/z80prog.s $(z80bin)
 
 data/cellspr.img: data/cellspr.png
@@ -76,6 +76,10 @@ clean:
 cleandep:
 	rm -f $(dep)
 
+.PHONY: cleandata
+cleandata:
+	rm -f data/*.img data/*.tiles data/*.tmap data/*.cmap
+
 .PHONY: run
 run: $(bin)
 	mednafen $<
@@ -91,12 +95,26 @@ install: $(bin)
 	[ -f /media/usbmass/MEGA/MEGA.RBF ] || cp $(bin) /media/usbmass/MEGA/MEGA.BIN
 	umount /media/usbmass
 
+.PHONY: debug
+debug: $(bin)
+	$(TC)gdb $(elf)
+
 # ---- tools ----
 PNGDUMP = tools/pngdump/pngdump
+JSON2TMAP = tools/json2tmap/json2tmap
 
 $(PNGDUMP): tools/pngdump/main.c tools/pngdump/image.c tools/pngdump/quant.c
 	$(MAKE) -C tools/pngdump
 
+$(JSON2TMAP): tools/json2tmap/json2tmap.c
+	$(MAKE) -C tools/json2tmap
+
+%.tmap: %.json $(JSON2TMAP)
+	$(JSON2TMAP) $< $@
+
+%.tiles: %-tiles.png $(PNGDUMP)
+	$(PNGDUMP) -o $@ -oc $(@:.tiles=.cmap) -T 8x8 $<
+
 %.tiles: %.png $(PNGDUMP)
 	$(PNGDUMP) -o $@ -oc $(@:.tiles=.cmap) -om $(@:.tiles=.tmap) -T 8x8 -D $<