projects
/
mdlife
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foo
[mdlife]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
7ad74b6
..
6c173f8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,11
+14,12
@@
bin = $(name).bin
warn = -pedantic -Wall
dbg = -g
warn = -pedantic -Wall
dbg = -g
-opt = -O2
+opt = -O3
def = -D__NO_CTYPE
inc = -I. -Isrc -Isrc/libc
def = -D__NO_CTYPE
inc = -I. -Isrc -Isrc/libc
-TC = m68k-linux-gnu-
+ARCH = m68k-elf
+TC = $(ARCH)-
CC = $(TC)gcc
AS = $(TC)as
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)
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
Z80AS = vasmz80_oldstyle
Z80ASFLAGS = -Fvobj
@@
-42,7
+42,7
@@
$(bin): $(elf)
$(OBJCOPY) -O binary $< $@
$(elf): $(obj)
$(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)
$(z80bin): $(z80obj)
$(Z80LD) -o $@ $(Z80LDFLAGS) $(z80obj)
@@
-50,7
+50,8
@@
$(z80bin): $(z80obj)
disasm: $(elf)
$(OBJDUMP) -D $< >$@
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
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
$(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 $<
%.img: %.png $(PNGDUMP)
$(PNGDUMP) -o $@ -oc $(@:.img=.cmap) -T 8x8 $<