X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=6c173f86b8cf2c520a07f5d43fff01a8e7b07da4;hb=dc2165689855c0517d30fb10c1b71464e42d8b6b;hp=7ad74b6f8429bb930495cff4ee798458a3bef892;hpb=cb7d3d359cefcf199f71e387d00049ec656bc0bf;p=mdlife

diff --git a/Makefile b/Makefile
index 7ad74b6..6c173f8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,12 @@ bin = $(name).bin
 
 warn = -pedantic -Wall
 dbg = -g
-opt = -O2
+opt = -O3
 def = -D__NO_CTYPE
 inc = -I. -Isrc -Isrc/libc
 
-TC = m68k-linux-gnu-
+ARCH = m68k-elf
+TC = $(ARCH)-
 
 CC = $(TC)gcc
 AS = $(TC)as
@@ -29,8 +30,7 @@ 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 -Wl,-print-gc-sections -nostdlib -lgcc
 
 Z80AS = vasmz80_oldstyle
 Z80ASFLAGS = -Fvobj
@@ -42,7 +42,7 @@ $(bin): $(elf)
 	$(OBJCOPY) -O binary $< $@
 
 $(elf): $(obj)
-	$(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
+	$(CC) -o $@ $(obj) -Wl,-Map,link.map $(LDFLAGS)
 
 $(z80bin): $(z80obj)
 	$(Z80LD) -o $@ $(Z80LDFLAGS) $(z80obj)
@@ -50,7 +50,8 @@ $(z80bin): $(z80obj)
 disasm: $(elf)
 	$(OBJDUMP) -D $< >$@
 
-src/data-asm.o: src/data.s data/font8x8.img data/cellspr.img
+src/data-asm.o: src/data.s data/font8x8.img data/cellspr.img data/simbabg.tiles \
+	data/simbafg.tiles
 src/z80prog-asm.o: src/z80prog.s $(z80bin)
 
 data/cellspr.img: data/cellspr.png
@@ -96,5 +97,8 @@ PNGDUMP = tools/pngdump/pngdump
 $(PNGDUMP): tools/pngdump/main.c tools/pngdump/image.c tools/pngdump/quant.c
 	$(MAKE) -C tools/pngdump
 
+%.tiles: %.png $(PNGDUMP)
+	$(PNGDUMP) -o $@ -oc $(@:.tiles=.cmap) -om $(@:.tiles=.tmap) -T 8x8 -D $<
+
 %.img: %.png $(PNGDUMP)
 	$(PNGDUMP) -o $@ -oc $(@:.img=.cmap) -T 8x8 $<