X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld45_start_nothing;a=blobdiff_plain;f=Makefile;fp=Makefile;h=1a2fcb44e034f6efc7e3b89325c7012d2221bb60;hp=aadff3693d802294e9f2179e4f5ab9b8e46843a8;hb=8a43487117b23806e478603f3c8ab72e37cd1882;hpb=78cf90d60c7cdbfcb8bc1d3e3d03a577d1b70f7b

diff --git a/Makefile b/Makefile
index aadff36..1a2fcb4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ name = game
 elf = $(name).elf
 bin = $(name).bin
 
-ASFLAGS = -f elf32
+ASFLAGS = -f elf32 -i src/
 LDFLAGS = -m elf_i386 -T game.ld -print-gc-sections
 
 QEMU_FLAGS = -fda floppy.img -serial file:serial.log -d guest_errors
@@ -23,21 +23,20 @@ boot.img: bootldr.bin $(bin)
 bootldr.bin: $(elf)
 	objcopy -O binary -j '.boot*' $< $@
 
-$(bin): $(elf) $(data)
+$(bin): $(elf)
 	objcopy -O binary -R '.boot*' $< $@
 
 $(elf): $(obj)
 	$(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
 
+src/data.o: src/data.asm $(data)
+
 %.o: %.asm
 	nasm -o $@ $(ASFLAGS) $<
 
-data/sprsheet.inc: data/sprsheet.png
-	img2tiles -o $@ -n -t 32x32 $<
-
 .PHONY: clean
 clean:
-	rm -f $(bin) $(obj) bootldr.bin floppy.img boot.img
+	rm -f $(bin) $(obj) $(data) bootldr.bin floppy.img boot.img
 
 .PHONY: disasm
 disasm: bootldr.disasm $(name).disasm
@@ -61,3 +60,13 @@ debug: floppy.img
 
 .PHONY: sym
 sym: $(name).sym
+
+
+tools/csprite/csprite:
+	$(MAKE) -C tools/csprite
+
+data/sprsheet.inc: data/sprsheet.png
+	tools/csprite/csprite -n sprsheet -s 32x32 $< >$@
+
+#data/sprsheet.inc: data/sprsheet.png
+#	img2tiles -o $@ -n -t 32x32 $<