changeset 960:ea69ed12af12

Added OS9FORMAT macros which inherently specify the disk format, so that Makefile.rules is the only place that needs changing if os9 format's options change
author boisy
date Sun, 26 Jan 2003 20:46:46 +0000
parents dd4d37b0dd23
children 53b612a9ef45
files 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/subsim/makefile level1/cmds/format.asm level1/makefile level2/makefile
diffstat 13 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/basic09/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/basic09/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -38,7 +38,7 @@
 
 dsk:	all
 	$(RM) $(DISK)
-	$(OS9FORMAT) $(DISK) -n"Basic09"
+	$(OS9FORMAT_SS35) $(DISK) -n"Basic09"
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(ALLOBJS) $(DISK),CMDS
 	$(CPL) $(TXTFILES) $(DISK),.
--- a/3rdparty/packages/cc/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/cc/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -20,7 +20,7 @@
 
 dsk:	all
 	$(RM) $(DISK)
-	$(OS9FORMAT) $(DISK) -t40 -h2 -n"C Compiler"
+	$(OS9FORMAT_DS40) $(DISK) -n"C Compiler"
 	$(MAKDIR) $(DISK),CMDS
 	$(MAKDIR) $(DISK),LIB
 	$(MAKDIR) $(DISK),DEFS
--- a/3rdparty/packages/fsim2/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/fsim2/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -30,7 +30,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -n"Flight Simulator 2"
+	$(OS9FORMAT_SS35) $(DISK) -n"Flight Simulator 2"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/koronis/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/koronis/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -33,7 +33,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -n"Koronis Rift"
+	$(OS9FORMAT_SS35) $(DISK) -n"Koronis Rift"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/kyumgai/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/kyumgai/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -35,7 +35,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -t40 -h2 -n"Kyum-Gai: To Be Ninja"
+	$(OS9FORMAT_DS40) $(DISK) -n"Kyum-Gai: To Be Ninja"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/mm/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/mm/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -30,7 +30,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -t40 -h2 -n"Microscopic Mission"
+	$(OS9FORMAT_DS40) $(DISK) -n"Microscopic Mission"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/multivue/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -26,7 +26,7 @@
 
 dsk:	all
 	$(RM) $(DISK)
-	$(OS9FORMAT) $(DISK) -n"Multi-Vue"
+	$(OS9FORMAT_SS35) $(DISK) -n"Multi-Vue"
 	$(MAKDIR) $(DISK),CMDS
 	$(MAKDIR) $(DISK),CMDS/ICONS
 	$(MAKDIR) $(DISK),SYS
--- a/3rdparty/packages/rof/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/rof/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -29,7 +29,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -n"Rescue on Fractalus"
+	$(OS9FORMAT_SS35) $(DISK) -n"Rescue on Fractalus"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -31,7 +31,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -t40 -h2 -n"Leisure Suit Larry"
+	$(OS9FORMAT_DS40) $(DISK) -n"Leisure Suit Larry"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/3rdparty/packages/subsim/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/3rdparty/packages/subsim/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -31,7 +31,7 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(CD) $(LEVEL2); make
-	$(OS9FORMAT) $(DISK) -t40 -h2 -n"Sub Battle Simulator"
+	$(OS9FORMAT_DS40) $(DISK) -n"Sub Battle Simulator"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) os9boot kernel_1773
--- a/level1/cmds/format.asm	Sun Jan 26 20:45:42 2003 +0000
+++ b/level1/cmds/format.asm	Sun Jan 26 20:46:46 2003 +0000
@@ -22,8 +22,8 @@
 * Disassembled 02/07/17 11:00:13 by Disasm v1.6 (C) 1988 by RML
 
          ifp1
-         use   /dd/defs/defsfile
-         use   /dd/defs/rbfdefs
+         use   defsfile
+         use   rbfdefs
          endc
 
 DOHELP   set   0
--- a/level1/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/level1/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -45,7 +45,7 @@
 
 $(DSK_DS40):
 	$(RM) $(DSK_DS40)
-	$(OS9FORMAT) $(DSK_DS40) -t40 -h2 -n"OS-9 Level One System Disk"
+	$(OS9FORMAT_DS40) $(DSK_DS40) -n"OS-9 Level One System Disk"
 	$(OS9GEN) $(DSK_DS40) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
 	$(MAKDIR) $(DSK_DS40),CMDS
 	$(MAKDIR) $(DSK_DS40),SYS
--- a/level2/makefile	Sun Jan 26 20:45:42 2003 +0000
+++ b/level2/makefile	Sun Jan 26 20:46:46 2003 +0000
@@ -51,7 +51,7 @@
 
 $(DSK_DS40_1):
 	-$(RM) $(DSK_DS40_1)
-	$(OS9FORMAT) $(DSK_DS40_1) -t40 -h2 -n"OS-9 Level Two System Disk"
+	$(OS9FORMAT_DS40) $(DSK_DS40_1) -n"OS-9 Level Two System Disk"
 	$(OS9GEN) $(DSK_DS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
 	$(MAKDIR) $(DSK_DS40_1),CMDS
 	$(MAKDIR) $(DSK_DS40_1),SYS
@@ -65,6 +65,6 @@
 
 $(DSK_DS40_2):
 	-$(RM) $(DSK_DS40_2)
-	$(OS9FORMAT) $(DSK_DS40_2) -t40 -h2 -n"OS-9 Level Two Development Disk"
+	$(OS9FORMAT_DS40) $(DSK_DS40_2) -n"OS-9 Level Two Development Disk"
 	$(MAKDIR) $(DSK_DS40_2),DEFS
 	$(CD) DEFS; $(CPL) $(DEFS) ../$(DSK_DS40_2),DEFS