Mercurial > hg > Members > kono > nitros9-code

changeset 2123:82081ff99be5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Redid makefiles, separating 40 and 80 track disk images. Also added 80 track disk images to some games that didn't have one.
author boisy
date Tue, 28 Aug 2007 19:42:00 +0000
parents 055c774cb633
children bb71cb21493e
files 3rdparty/packages/sierra/blackcauldron/makefile 3rdparty/packages/sierra/blackcauldron/tOC_80d.txt 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/objs/mnln.asm 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile
diffstat 9 files changed, 163 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -6,9 +6,11 @@
 
 DISK_1_40D	= blackcauldron_d1_40d.dsk
 DISK_2_40D	= blackcauldron_d2_40d.dsk
+DISK_80D	= blackcauldron_80d.dsk
 
 DISK_1_40D_NAME = "The Black Cauldron Disk 1"
 DISK_2_40D_NAME = "The Black Cauldron Disk 2"
+DISK_80D_NAME   = "The Black Cauldron"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
@@ -24,6 +26,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -32,10 +43,12 @@
 TEXTFILES	= startup tOC_40d.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
-		vol.1
+		vol.1 words.tok
 
 SUPPORTFILES_D2	= object vol.0 vol.2
 
+SUPPORTFILES	= $(SUPPORTFILES_D1) $(SUPPORTFILES_D2)
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
@@ -43,14 +56,14 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
+dsk_40d:	all
 	$(RM) $(DISK_1_40D) $(DISK_2_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_40d kernel_1773
+	$(RM) os9boot_40d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
@@ -66,8 +79,31 @@
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_80D),.
+	$(OS9RENAME) $(DISK_80D),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
-	$(CP) $(DISK_1_40D) $(DISK_2_40D)
+	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/blackcauldron/tOC_80d.txt	Tue Aug 28 19:42:00 2007 +0000
@@ -0,0 +1,1 @@
+d1 s1 v0 v1 v2
--- a/3rdparty/packages/sierra/goldrush/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/goldrush/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -73,7 +73,7 @@
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),.
 
 dskcopy: dsk
-	$(CP) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -56,42 +56,52 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+dsk_40d:	all
+	$(RM) $(DISK_1_40D) $(DISK_2_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(RM) os9boot_40d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_80D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
 
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -57,42 +57,52 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+dsk_40d:	all
+	$(RM) $(DISK_1_40D) $(DISK_2_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
 	$(RM) os9boot_40d os9boot_80d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_80D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
 
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -62,44 +62,54 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D)
+dsk_40d:	all
+	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(RM) os9boot_40d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_80D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_80D),.
+	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSKDIR)
 
--- a/3rdparty/packages/sierra/objs/mnln.asm	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/objs/mnln.asm	Tue Aug 28 19:42:00 2007 +0000
@@ -2576,8 +2576,8 @@
 
 * these get accessed for a getstat call
 * if a call to the Seek routine contained a value in b
-         fcb   #SS.pos     $05
-         fcb   #SS.size    $02
+         fcb   SS.Pos     $05
+         fcb   SS.Size    $02
 
 *        Think these values have no significance
 *        and are just junk place holders ??
--- a/3rdparty/packages/sierra/spacequest1/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -57,42 +57,52 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+dsk_40d:	all
+	$(RM) $(DISK_1_40D) $(DISK_2_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(RM) os9boot_40d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_80D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
 
--- a/3rdparty/packages/sierra/spacequest2/makefile	Tue Aug 28 19:36:17 2007 +0000
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Tue Aug 28 19:42:00 2007 +0000
@@ -61,44 +61,54 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D)
+dsk_40d:	all
+	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
 	$(RM) os9boot_40d os9boot_80d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_80D),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+
+dsk_80d:	all
+	$(RM) $(DISK_80D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(MAKDIR) $(DISK_80D),CMDS
+	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_80D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_80D),.
+	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 
+dsk:	dsk_40d dsk_80d
+
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSKDIR)