Mercurial > hg > Members > kono > nitros9-code
changeset 2667:9da050947330 lwtools-port
Additional modifications to build with lwasm
Some additional modifications to command line switches for lwasm
compatibility.
| author | William Astle <lost@l-w.ca> |
|---|---|
| date | Sun, 10 Jun 2012 13:27:11 -0600 |
| parents | 69c0ec1aa9c7 |
| children | 07441dfebc27 |
| files | level2/coco3/cmds/makefile rules.mak |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/level2/coco3/cmds/makefile Sun Jun 10 13:26:42 2012 -0600 +++ b/level2/coco3/cmds/makefile Sun Jun 10 13:27:11 2012 -0600 @@ -5,7 +5,7 @@ vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09 DEPENDS = ./makefile -AFLAGS += -i=$(NITROS9DIR)/3rdparty/packages/basic09 +AFLAGS += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09 LFLAGS += -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l CMDS = asm attr backup binex build cmp cobbler copy cputype \ @@ -29,22 +29,22 @@ all: $(CMDS) $(CMDS_D2) $(CMDS_DW) shell utilpak1 $(DEPENDS) runb: runb.asm - $(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1 + $(AS) $(AFLAGS) $< $(ASOUT)$@ DPWD=1 $(MERGE) $@ $(SUBS)>$@.tmp $(RM) $@ $(MOVE) $@.tmp $@ tmode: xmode.asm - $(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1 + $(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1 xmode: xmode.asm - $(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1 + $(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1 pwd: pd.asm - $(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1 + $(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1 pxd: pd.asm - $(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1 + $(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1 shell: $(SHELLMODS) $(DEPENDS) $(MERGE) $(SHELLMODS)>$@
--- a/rules.mak Sun Jun 10 13:26:42 2012 -0600 +++ b/rules.mak Sun Jun 10 13:27:11 2012 -0600 @@ -43,7 +43,7 @@ # Use the cross assembler #AS = os9asm -i=$(DEFSDIR) -AS = lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=$(DEFSDIR) +AS = lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=. --includedir=$(DEFSDIR) ASOUT = -o AFLAGS = -DNOS9VER=$(NOS9VER) -DNOS9MAJ=$(NOS9MAJ) -DNOS9MIN=$(NOS9MIN) -DNOS9DBG=$(NOS9DBG) ifdef PORT