X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ld45_start_nothing;a=blobdiff_plain;f=Makefile;h=90ea9dadd7798022a418ce6dfaba5dc2c00613b3;hp=4d180c92f967d81aaab5918124c228c9c54c1f63;hb=6a16a1c526937ee551f968901cb949d55e35ecda;hpb=43024162f96501c111a0fb7ff6b14f39d478c1a3 diff --git a/Makefile b/Makefile index 4d180c9..90ea9da 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ src = $(wildcard src/*.asm) +data = data/sprsheet.inc bin = game QEMU_FLAGS = -fda floppy.img -serial file:serial.log -soundhw sb16 -d guest_errors @@ -9,8 +10,8 @@ all: floppy.img bootldr: src/boot/boot.asm $(bin) nasm -o $@ -f bin -DBINSIZE=`ls -l $(bin) | awk '{print $$5}'` $< -$(bin): $(src) - nasm -o $@ -f bin src/main.asm +$(bin): $(src) $(data) + nasm -o $@ -f bin -i src/ src/main.asm boot.img: bootldr $(bin) cat $^ >$@ @@ -19,6 +20,9 @@ floppy.img: boot.img dd of=$@ if=/dev/zero bs=512 count=2880 dd of=$@ if=$< bs=1 conv=notrunc +data/sprsheet.inc: data/sprsheet.png + img2tiles -o $@ -n -t 32x32 $< + .PHONY: clean clean: rm -f $(bin) bootldr floppy.img boot.img