From 95f97d807db96e156406b6340a4b213adebb501c Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 1 Aug 2018 19:11:47 +0200 Subject: [PATCH] Renamed object files generated from asm files. Make sure that 'make' doesn't mix up object files generated from asm files and object files generated from C files. --- apps/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 2959c50..6ccbce9 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -66,31 +66,28 @@ CC65 := $(shell cl65 --print-target-path) ATARI_CFG = atari.cfg telnet65.com: ATARI_CFG = atrtelnet.cfg -%.o: %.s - ca65 $< +%.s.o: %.s + ca65 -o $@ $< %.o: %.c -%.prg: %.o ip65 drivers +%.prg: %.s.o ip65 drivers ld65 -o $*.prg -C c64.cfg -m $*.c64.map -vm $< $(IP65LIB) $(C64DRIVERLIB) c64.lib -%.bin: %.o ip65 drivers +%.bin: %.s.o ip65 drivers ld65 -o $*.bin -C apple2.cfg -m $*.a2.map -vm $< $(IP65LIB) $(A2DRIVERLIB) apple2.lib -%.com: %.o ip65 drivers +%.com: %.s.o ip65 drivers ld65 -o $*.com -C $(ATARI_CFG) -m $*.atr.map -vm $< $(IP65LIB) $(ATRDRIVERLIB) atari.lib %.prg: %.c ip65 drivers cl65 -o $*.prg -O -t c64 -m $*.c64.map -vm $< $(IP65LIB) ../drivers/ip65_c64.lib - rm $*.o %.bin: %.c ip65 drivers cl65 -o $*.bin -O -t apple2enh -m $*.a2.map -vm $< --start-addr 0x0C00 apple2enh-iobuf-0800.o $(IP65LIB) ../drivers/ip65_apple2.lib - rm $*.o %.com: %.c ip65 drivers cl65 -o $*.com -O -t atari -m $*.atr.map -vm $< $(IP65LIB) ../drivers/ip65_atari.lib - rm $*.o ip65.d64: prg $(C1541) -format ip65,00 d64 $@