projects
/
ld45_start_nothing
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input sortof-works
[ld45_start_nothing]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
aadff36
..
1a2fcb4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,7
+5,7
@@
name = game
elf = $(name).elf
bin = $(name).bin
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
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*' $< $@
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)
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) $<
%.o: %.asm
nasm -o $@ $(ASFLAGS) $<
-data/sprsheet.inc: data/sprsheet.png
- img2tiles -o $@ -n -t 32x32 $<
-
.PHONY: clean
clean:
.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
.PHONY: disasm
disasm: bootldr.disasm $(name).disasm
@@
-61,3
+60,13
@@
debug: floppy.img
.PHONY: sym
sym: $(name).sym
.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 $<