projects
/
mdlife
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMA and sprites (not working yet)
[mdlife]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e6043d4
..
4420eb1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
csrc = $(wildcard src/*.c) $(wildcard src/libc/*.c)
asrc = $(wildcard src/*.s)
aSsrc = $(wildcard src/*.S)
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)
dep = $(csrc:.c=.d)
z80src = $(wildcard src/z80/*.asm)
@@
-46,10
+46,17
@@
$(elf): $(obj)
$(z80bin): $(z80obj)
$(Z80LD) -o $@ $(Z80LDFLAGS) $(z80obj)
$(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)
-include $(dep)
+%-asm.o: %.s
+ $(AS) -o $@ $(ASFLAGS) $<
+
+%-asm.o: %.S
+ $(CC) -o $@ $(ASFLAGS) -DASM -c $<
+
%.z80: %.asm
$(Z80AS) -o $@ $(Z80ASFLAGS) $< >/dev/null
%.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
[ -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 $<