Mercurial > hg > Members > kono > nitros9-code
changeset 2919:542da7896526
d64/dalpha: Use variables from ports.mak in makefile
Makes it also easier to diff it with the d64 makefile.
Still some work to unify them into one file.
Also make the disk labels fit within 16 character, both
in d64 and dalpha makefile.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Fri, 17 Jan 2014 22:56:23 +0100 |
| parents | ada61f1951b7 |
| children | d0b7780ab4af |
| files | level1/d64/makefile level1/dalpha/makefile |
| diffstat | 2 files changed, 10 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/level1/d64/makefile Fri Jan 17 22:46:19 2014 +0100 +++ b/level1/d64/makefile Fri Jan 17 22:56:23 2014 +0100 @@ -135,7 +135,7 @@ $(DSK360K_1): $(RM) $@ - $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Dragon Level 1 Disk 1" + $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/$(CPU) $(MACHINE) #1" $(OS9GEN) $@ -d -b=$(BOOTFILE_DS40) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS @@ -154,7 +154,7 @@ $(DSK360K_2): $(RM) $@ - $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Dragon Level 1 Disk 2" + $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/$(CPU) $(MACHINE) #2" $(MAKDIR) $@,NITROS9 $(MAKDIR) $@,NITROS9/6809L1 $(MAKDIR) $@,NITROS9/6809L1/CMDS @@ -192,7 +192,7 @@ $(DSK720K): $(RM) $@ - $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/6809 Dragon Level 1" + $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/$(CPU) $(MACHINE)" $(OS9GEN) $@ -d -b=$(BOOTFILE_DS80) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS @@ -244,7 +244,7 @@ $(DSK180K_1): $(RM) $@ - $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/6809/Dragon Level 1 Disk 1" + $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/$(CPU) $(MACHINE) #1" $(OS9GEN) $@ -d -b=$(BOOTFILE_SS40) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS @@ -261,11 +261,11 @@ $(DSK180K_2): $(RM) $@ - $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/6809/Dragon Level 1 Disk 2" + $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/$(CPU) $(MACHINE) #2" $(MAKDIR) $@,CMDS $(CD) cmds; $(OS9COPY) $(CMDS525_2) ../$@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS525_2),$@,CMDS/$(file)) info: - @$(ECHO) "*** NitrOS-9/6809 Level 1 for the Dragon 64 ***" + @$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level1/dalpha/makefile Fri Jan 17 22:46:19 2014 +0100 +++ b/level1/dalpha/makefile Fri Jan 17 22:56:23 2014 +0100 @@ -31,9 +31,6 @@ include port.mak -CPU = 6809 -LEVEL = 1 - # TERMWIDTH can be either VDG or HR, for 32x16 or 51x24 respectivly #NOTE must be lower case. TERMWIDTH = hr @@ -130,7 +127,7 @@ $(DSK360K_1): $(RM) $@ - $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/6809 Dragon Alpha Level 1 Disk 1" + $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/$(CPU) $(MACHINE) #1" $(OS9GEN) $@ -d -b=$(BOOTFILE_SS80) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS @@ -149,7 +146,7 @@ $(DSK360K_2): $(RM) $@ - $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/6809 Dragon Alpha Level 1 Disk 2" + $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/$(CPU) $(MACHINE) #2" $(MAKDIR) $@,NITROS9 $(MAKDIR) $@,NITROS9/6809L1 $(MAKDIR) $@,NITROS9/6809L1/CMDS @@ -187,7 +184,7 @@ $(DSK720K): $(RM) $@ - $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/6809 Dragon Level 1" + $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/$(CPU) $(MACHINE)" $(OS9GEN) $@ -d -b=$(BOOTFILE_DS80) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS @@ -237,5 +234,5 @@ $(SOFTLINK) $@ $(LDSK720K) info: - @$(ECHO) "*** NitrOS-9/6809 Level 1 for the Dragon Alpha ***" + @$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)