Mercurial > hg > Members > kono > nitros9-code

changeset 2684:2a37d4530972 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Even more command line fixups for lwasm
author William Astle <lost@l-w.ca>
date Sun, 10 Jun 2012 18:38:22 -0600
parents 674fcee0851b
children 2bf46e4a7c27
files 3rdparty/drivers/disto/makefile 3rdparty/drivers/disto/r0.asm level1/atari/defs/makefile level1/coco/defs/makefile level1/d64/defs/makefile level1/dalpha/defs/makefile level1/modules/dwinit.asm level1/tano/defs/makefile level2/coco3/defs/makefile level2/coco3_6309/defs/makefile level3/coco3/defs/makefile level3/coco3_6309/defs/makefile
diffstat 12 files changed, 49 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/drivers/disto/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/3rdparty/drivers/disto/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -2,12 +2,12 @@
 
 vpath %.asm $(LEVEL2)/modules:$(LEVEL1)/modules
 
-L1_256 = $(AFLAGS) -aLevel=1 -aRAMSize=1
-L2_256 = $(AFLAGS) -aLevel=2 -aRAMSize=1
-L1_512 = $(AFLAGS) -aLevel=1 -aRAMSize=2
-L2_512 = $(AFLAGS) -aLevel=2 -aRAMSize=2
+L1_256 = $(AFLAGS) -DLevel=1 -DRAMSize=1
+L2_256 = $(AFLAGS) -DLevel=2 -DRAMSize=1
+L1_512 = $(AFLAGS) -DLevel=1 -DRAMSize=2
+L2_512 = $(AFLAGS) -DLevel=2 -DRAMSize=2
 
-L2_DNHFC = $(AFLAGS) -aLevel=2
+L2_DNHFC = $(AFLAGS) -DLevel=2
 
 DEPENDS		= ./makefile
 DRVRS		= rampak.dr parallel.dr
@@ -21,12 +21,12 @@
 ALLOBJS		= $(DRVRS) $(DESCS) $(NHDRVRS)
 
 # Device Descriptor Macros
-SSDD35          = -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-                -aInterlv=3 -aSAS=8 -aDensity=1
-DSDD40          = -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-                -aInterlv=3 -aSAS=8 -aDensity=1
-DSDD80          = -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-                -aInterlv=3 -aSAS=8 -aDensity=3
+SSDD35          = -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+                -DInterlv=3 -DSAS=8 -DDensity=1
+DSDD40          = -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+                -DInterlv=3 -DSAS=8 -DDensity=1
+DSDD80          = -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+                -DInterlv=3 -DSAS=8 -DDensity=3
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -40,33 +40,33 @@
 # Disto Super Controller II Device Descriptors
 # 35 Track Single-Sided
 ddd0_35s.dd: rb1773desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -DDD=1
 
 d0_35s.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35)
 
 d1_35s.dd: rb1773desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -DDNum=1
 
 # 40 Track Double-Sided
 ddd0_40d.dd: rb1773desc.asm  
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -DDD=1
 
 d0_40d.dd: rb1773desc.asm       
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40)
 
 d1_40d.dd: rb1773desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -DDNum=1
 
 # 80 Track Double-Sided
 ddd0_80d.dd: rb1773desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -DDD=1
 
 d0_80d.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80)
 
 d1_80d.dd: rb1773desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -DDNum=1
 
 # RAM Disk Descriptors
 r0_256_l1.dd: r0.asm
--- a/3rdparty/drivers/disto/r0.asm	Sun Jun 10 15:41:52 2012 -0600
+++ b/3rdparty/drivers/disto/r0.asm	Sun Jun 10 18:38:22 2012 -0600
@@ -7,7 +7,7 @@
 
          ifp1  
          use   defsfile
-         use   rbfdefs
+;         use   rbfdefs
          endc  
 
 tylg     set   Devic+Objct
--- a/level1/atari/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/atari/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=1
+DEFOPTS		= --preprocess -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d atari.d atarivtio.d
 ALLOBJS		= $(DEFS)
--- a/level1/coco/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/coco/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -DLevel=1
+DEFOPTS		= --preprocess -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d coco.d cocovtio.d
 ALLOBJS		= $(DEFS)
--- a/level1/d64/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/d64/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=1
+DEFOPTS		= --preprocess -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d dragon.d dragonvtio.d
 ALLOBJS		= $(DEFS)
--- a/level1/dalpha/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/dalpha/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=1
+DEFOPTS		= --preprocess -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d dragon.d dragonvtio.d
 ALLOBJS		= $(DEFS)
--- a/level1/modules/dwinit.asm	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/modules/dwinit.asm	Sun Jun 10 18:38:22 2012 -0600
@@ -5,6 +5,7 @@
 
 DWInit
 			pshs		a,x
+	ifdef PIA1Base
                ldx       #PIA1Base           $FF20
                clr       1,x                 clear CD
                lda       #%11111110
@@ -12,4 +13,5 @@
                lda       #%00110100
                sta       1,x
                lda       ,x
+	endc
                puls		a,x,pc
--- a/level1/tano/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level1/tano/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=1
+DEFOPTS		= --preprocess -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d dragon.d dragonvtio.d
 ALLOBJS		= $(DEFS)
--- a/level2/coco3/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level2/coco3/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=2
+DEFOPTS		= --preprocess -DLevel=2
 PERMDEFS	= Defsfile
 DEFS		= os9.d rbf.d scf.d coco.d coco3vtio.d
 ALLOBJS		= $(DEFS) $(PERMDEFS)
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 os9.d: $(DEFSDIR)/os9.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9.D=0 $< > $@
 
 rbf.d: $(DEFSDIR)/rbf.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aRBF.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBF.D=0 $< > $@
 
 scf.d: $(DEFSDIR)/scf.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSCF.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCF.D=0 $< > $@
 
 coco.d: $(DEFSDIR)/coco.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aCOCO.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCO.D=0 $< > $@
 
 coco3vtio.d: $(DEFSDIR)/cocovtio.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aCOCOVTIO.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level2/coco3_6309/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level2/coco3_6309/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=2
+DEFOPTS		= --preprocess -DLevel=2
 PERMDEFS	= Defsfile
 DEFS		= os9.d rbf.d scf.d coco.d coco3vtio.d
 ALLOBJS		= $(DEFS) $(PERMDEFS)
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 os9.d: $(DEFSDIR)/os9.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9.D=0 $< > $@
 
 rbf.d: $(DEFSDIR)/rbf.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aRBF.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBF.D=0 $< > $@
 
 scf.d: $(DEFSDIR)/scf.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSCF.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCF.D=0 $< > $@
 
 coco.d: $(DEFSDIR)/coco.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aCOCO.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCO.D=0 $< > $@
 
 coco3vtio.d: $(DEFSDIR)/cocovtio.d
-	$(AS) $(AFLAGS) $(DEFOPTS) -aCOCOVTIO.D=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level3/coco3/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level3/coco3/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=3
+DEFOPTS		= --preprocess -DLevel=3
 PERMDEFS	= Defsfile
 DEFS		= OS9Defs RBFDefs SCFDefs SysType VTIODefs
 ALLOBJS		= $(DEFS) $(PERMDEFS)
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9DEFS=0 $< > $@
 
 RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBFDEFS=0 $< > $@
 
 SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCFDEFS=0 $< > $@
 
 SysType: $(DEFSDIR)/systype
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSYSTYPE=0 $< > $@
 
 VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(AFLAGS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DVTIODEFS=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level3/coco3_6309/defs/makefile	Sun Jun 10 15:41:52 2012 -0600
+++ b/level3/coco3_6309/defs/makefile	Sun Jun 10 18:38:22 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=3
+DEFOPTS		= --preprocess -DLevel=3
 PERMDEFS	= Defsfile
 DEFS		= OS9Defs RBFDefs SCFDefs SysType VTIODefs
 ALLOBJS		= $(DEFS) $(PERMDEFS)
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9DEFS=0 $< > $@
 
 RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBFDEFS=0 $< > $@
 
 SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCFDEFS=0 $< > $@
 
 SysType: $(DEFSDIR)/systype
-	$(AS) $(AFLAGS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSYSTYPE=0 $< > $@
 
 VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(AFLAGS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -DVTIODEFS=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)