From 411b945972767dd34305a208a3299c23f37157ab Mon Sep 17 00:00:00 2001 From: Christian Groessler Date: Mon, 2 Oct 2017 08:05:39 +0200 Subject: [PATCH] Fix Atari linker config file in "apps" and "test" directories. --- apps/Makefile | 5 ++++- test/Makefile | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index a11b61e..7e07073 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -70,6 +70,9 @@ ip65: drivers: make -C ../drivers +ATARI_CFG = atari.cfg +telnet65.com: ATARI_CFG = atrtelnet.cfg + %.o: %.s ca65 $< @@ -80,7 +83,7 @@ drivers: ld65 -o $*.bin -C apple2.cfg -m $*.a2.map -vm $< $(IP65LIB) $(A2DRIVERLIB) apple2.lib %.com: %.o ip65 drivers $(INCFILES) - ld65 -o $*.com -C atrtelnet.cfg -m $*.atr.map -vm $< $(IP65LIB) $(ATRDRIVERLIB) atari.lib + ld65 -o $*.com -C $(ATARI_CFG) -m $*.atr.map -vm $< $(IP65LIB) $(ATRDRIVERLIB) atari.lib %.vicprg: %.o ip65 drivers $(INCFILES) ld65 -o $*.vicprg -C vic20-32k.cfg -m $*.vic.map -vm $< $(IP65LIB) $(VICDRIVERLIB) vic20.lib diff --git a/test/Makefile b/test/Makefile index 83d5ec3..709f79c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -81,6 +81,9 @@ ip65: drivers: make -C ../drivers +ATARI_CFG = atari.cfg +vt100.com: ATARI_CFG = ../apps/atrtelnet.cfg + %.o: %.s ca65 $< @@ -91,7 +94,7 @@ drivers: ld65 -o $*.bin -C apple2.cfg -m $*.a2.map -vm $< $(IP65LIB) $(A2DRIVERLIB) apple2.lib %.com: %.o ip65 drivers $(INCFILES) - ld65 -o $*.com -C atari.cfg -m $*.atr.map -vm $< $(IP65LIB) $(ATRDRIVERLIB) atari.lib + ld65 -o $*.com -C $(ATARI_CFG) -m $*.atr.map -vm $< $(IP65LIB) $(ATRDRIVERLIB) atari.lib %.vicprg: %.o ip65 drivers $(INCFILES) ld65 -o $*.vicprg -C vic20-32k.cfg -m $*.vic.map -vm $< $(IP65LIB) $(VICDRIVERLIB) vic20.lib