added relevant parts of libgcc

[mdlife] / Makefile

diff --git a/Makefile b/Makefile
index 002cba4..7ad74b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 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)
-dep = $(csrc:.c=.d)
+asrc = $(wildcard src/*.s) $(wildcard src/libc/*.s)
+aSsrc = $(wildcard src/*.S) $(wildcard src/libc/*.S)
+obj = $(asrc:.s=-asm.o) $(aSsrc:.S=-asm.o) $(csrc:.c=.o)
+dep = $(csrc:.c=.d) $(aSsrc:.S=-asm.d)
+
+z80src = $(wildcard src/z80/*.asm)
+z80obj = $(z80src:.asm=.z80)
+z80bin = z80.bin
 
 name = life
 elf = $(name).elf
@@ -20,12 +24,19 @@ CC = $(TC)gcc
 AS = $(TC)as
 LD = $(TC)ld
 OBJCOPY = $(TC)objcopy
+OBJDUMP = $(TC)objdump
 
 CFLAGS = -m68000 -ffreestanding -fno-builtin -fcommon $(warn) $(dbg) $(opt) $(def) $(inc) -MMD
 CPPFLAGS = $(def)
 ASFLAGS = -m68000 $(inc)
-LDFLAGS = -T megadrive.ld -print-gc-sections \
-                 -L/usr/lib/gcc-cross/m68k-linux-gnu/11 -lgcc
+LDFLAGS = -T megadrive.ld -print-gc-sections
+#                -L/usr/lib/gcc-cross/m68k-linux-gnu/11 -lgcc
+
+Z80AS = vasmz80_oldstyle
+Z80ASFLAGS = -Fvobj
+Z80LD = vlink
+Z80LDFLAGS = -T z80.ld -b rawbin1
+
 
 $(bin): $(elf)
        $(OBJCOPY) -O binary $< $@
@@ -33,11 +44,32 @@ $(bin): $(elf)
 $(elf): $(obj)
        $(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
 
+$(z80bin): $(z80obj)
+       $(Z80LD) -o $@ $(Z80LDFLAGS) $(z80obj)
+
+disasm: $(elf)
+       $(OBJDUMP) -D $< >$@
+
+src/data-asm.o: src/data.s data/font8x8.img data/cellspr.img
+src/z80prog-asm.o: src/z80prog.s $(z80bin)
+
+data/cellspr.img: data/cellspr.png
+
 -include $(dep)
 
+%-asm.o: %.s
+       $(AS) -o $@ $(ASFLAGS) $<
+
+%-asm.o: %.S
+       $(CC) -o $@ $(ASFLAGS) -DASM -MMD -c $<
+
+%.z80: %.asm
+       $(Z80AS) -o $@ $(Z80ASFLAGS) $< >/dev/null
+
 .PHONY: clean
 clean:
        rm -f $(obj) $(elf) $(bin)
+       rm -f $(z80obj) $(z80bin)
 
 .PHONY: cleandep
 cleandep:
@@ -57,3 +89,12 @@ install: $(bin)
        mount /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 $<