X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=4420eb1668b672f026b274617a707f00a9dba7d8;hb=88989dba0a2f0b59d782d25e01227df04452e8d3;hp=e6043d4b713bf89f8180717ff28f5db6cdb2788c;hpb=94fd86135077db5979af3694cf427dff6ff4df0c;p=mdlife

diff --git a/Makefile b/Makefile
index e6043d4..4420eb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 csrc = $(wildcard src/*.c) $(wildcard src/libc/*.c)
 asrc = $(wildcard src/*.s)
 aSsrc = $(wildcard src/*.S)
-obj = $(asrc:.s=.o) $(aSsrc:.S=.o) $(csrc:.c=.o)
+obj = $(asrc:.s=-asm.o) $(aSsrc:.S=-asm.o) $(csrc:.c=.o)
 dep = $(csrc:.c=.d)
 
 z80src = $(wildcard src/z80/*.asm)
@@ -46,10 +46,17 @@ $(elf): $(obj)
 $(z80bin): $(z80obj)
 	$(Z80LD) -o $@ $(Z80LDFLAGS) $(z80obj)
 
-src/z80prog.o: src/z80prog.s $(z80bin)
+src/data.o: src/data.s data/font8x8.img data/cellspr.img
+src/z80prog-asm.o: src/z80prog.s $(z80bin)
 
 -include $(dep)
 
+%-asm.o: %.s
+	$(AS) -o $@ $(ASFLAGS) $<
+
+%-asm.o: %.S
+	$(CC) -o $@ $(ASFLAGS) -DASM -c $<
+
 %.z80: %.asm
 	$(Z80AS) -o $@ $(Z80ASFLAGS) $< >/dev/null
 
@@ -77,3 +84,11 @@ install: $(bin)
 	[ -f /media/usbmass/MEGA/MEGA.RBF ] || cp $(bin) /media/usbmass/MEGA/MEGA.BIN
 	umount /media/usbmass
 
+# ---- tools ----
+PNGDUMP = tools/pngdump/pngdump
+
+$(PNGDUMP): tools/pngdump/main.c tools/pngdump/image.c tools/pngdump/quant.c
+	$(MAKE) -C tools/pngdump
+
+%.img: %.png $(PNGDUMP)
+	$(PNGDUMP) -o $@ -oc $(@:.img=.cmap) -T 8x8 $<