Mercurial > hg > Members > kono > nitros9-code

changeset 2499:2033e76ae3c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Permits DW3 build to work. RG
author robertgault
date Sun, 04 Apr 2010 02:24:59 +0000
parents 4d2c295061dc
children aba8cc54062b
files 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/sierra/manhunter1/makefile 3rdparty/packages/sierra/manhunter2/makefile 3rdparty/packages/sierra/policequest1/makefile 3rdparty/packages/sierra/spacequest0/makefile 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile
diffstat 7 files changed, 253 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -10,7 +13,7 @@
 
 DSKS		= $(DSK_FLOPPY) $(DSK_DW3)
 
-CMDS		= sierra mnln scrn shdw
+CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
@@ -48,7 +51,7 @@
 $(DSK_FLOPPY):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $@ -n$(DSK_NAME)
+	$(OS9FORMAT_DS80) -q $@ -n$(DSK_NAME)
 	$(MERGE) $(BOOTFILE_FLOPPY)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
@@ -58,13 +61,15 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW3):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $@ -n$(DSK_NAME)
+	$(OS9FORMAT_DW3) -q $@ -n$(DSK_NAME)
 	$(MERGE) $(BOOTFILE_DW3)>os9boot
 	$(MERGE) $(KERNEL_DW3)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
@@ -74,6 +79,7 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CP) $(SUPPORTFILES) $@,.
+	$(RM) tocgen
 	tocgen tOC.txt $@,tOC
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
--- a/3rdparty/packages/sierra/manhunter1/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/manhunter1/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -7,18 +10,22 @@
 DISK_1_80D	= manhunter1_d1_80d.dsk
 DISK_2_80D	= manhunter1_d2_80d.dsk
 DISK_3_80D	= manhunter1_d3_80d.dsk
+DISK_DW3	= manhunter1_dw3.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3)
 
 DISK_1_80D_NAME = "Manhunter I Disk 1"
 DISK_2_80D_NAME = "Manhunter I Disk 2"
 DISK_3_80D_NAME = "Manhunter I Disk 3"
+DISK_DW3_NAME = "Manhunter I DW3"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -28,12 +35,22 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(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
 
 TEXTFILES_D1	= startup tOC_80d.txt
 TEXTFILES	= startup tOC_80d.txt
+TEXTFILES_DW3	= startup tOC_DW3.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -42,6 +59,9 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.5 vol.9 vol.10 vol.11 vol.12
 
+SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 vol.4 vol.5 vol.9 vol.10 vol.11 vol.12 words.tok
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
@@ -50,25 +70,40 @@
 	$(RM) $(ALLOBJS)
 
 dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
 	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
 	$(MERGE) $(KERNEL)>kernel_1773
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
 	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d os9boot_80d kernel_1773
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_80d os9boot_80d kernel_1773 os9boot_dw3 kernel_dw3
 	$(MAKDIR) $(DISK_1_80D),CMDS
+	$(MAKDIR) $(DISK_DW3),CMDS
 	$(CP) $(CMDS) $(DISK_1_80D),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_80D),CMDS
+	$(CP) shell $(DISK_DW3),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
+	$(CPL) $(TEXTFILES_DW3) $(DISK_DW3),.
 	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
+	$(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
+	$(CP) $(SUPPORTFILES_DW3) $(DISK_DW3),.
+	$(RM) tocgen
 	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
 	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),.
 	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
--- a/3rdparty/packages/sierra/manhunter2/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/manhunter2/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -7,18 +10,21 @@
 DISK_1_80D	= manhunter2_d1_80d.dsk
 DISK_2_80D	= manhunter2_d2_80d.dsk
 DISK_3_80D	= manhunter2_d3_80d.dsk
+DISK_DW3	= manhunter2_dw3.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3)
 
 DISK_1_80D_NAME = "Manhunter II Disk 1"
 DISK_2_80D_NAME = "Manhunter II Disk 2"
 DISK_3_80D_NAME = "Manhunter II Disk 3"
+DISK_DW3_NAME = "Manhunter II DW3"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -28,12 +34,22 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(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
 
 TEXTFILES_D1	= startup tOC_80d.txt
 TEXTFILES	= startup tOC_80d.txt
+TEXTFILES_DW3	= startup tOC_DW3.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.9 vol.10 vol.11 words.tok
@@ -42,6 +58,9 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.3 vol.9 vol.10 vol.11
 
+SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 vol.9 vol.10 vol.11 words.tok
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
@@ -50,25 +69,40 @@
 	$(RM) $(ALLOBJS)
 
 dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
 	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
 	$(MERGE) $(KERNEL)>kernel_1773
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
 	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d os9boot_80d kernel_1773
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_80d os9boot_80d os9boot_dw3 kernel_1773 kernel_dw3
 	$(MAKDIR) $(DISK_1_80D),CMDS
+	$(MAKDIR) $(DISK_DW3),CMDS
 	$(CP) $(CMDS) $(DISK_1_80D),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_80D),CMDS
+	$(CP) shell $(DISK_DW3),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
+	$(CPL) $(TEXTFILES_DW3) $(DISK_DW3),.
 	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
+	$(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
+	$(CP) $(SUPPORTFILES_DW3) $(DISK_DW3),.
+	$(RM) tocgen
 	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
 	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),.
 	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
--- a/3rdparty/packages/sierra/policequest1/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/policequest1/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -7,18 +10,21 @@
 DISK_1_40D	= policequest1_d1_40d.dsk
 DISK_2_40D	= policequest1_d2_40d.dsk
 DISK_3_40D	= policequest1_d3_40d.dsk
+DISK_DW3	= policequest1_dw3.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW3)
 
 DISK_1_40D_NAME = "Police Quest I Disk 1"
 DISK_2_40D_NAME = "Police Quest I Disk 2"
 DISK_3_40D_NAME = "Police Quest I Disk 3"
+DISK_DW3_NAME	= "Police Quest I Disk"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -27,6 +33,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -34,6 +48,7 @@
 
 TEXTFILES_D1	= startup tOC_40d.txt
 TEXTFILES	= startup tOC_80d.txt
+TEXTFILES_DW3	= startup tOC_dw3.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
@@ -53,25 +68,40 @@
 	$(RM) $(ALLOBJS)
 
 dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW3)
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
 	$(MERGE) $(KERNEL)>kernel_1773
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_40d os9boot_80d os9boot_dw3 kernel_1773 kernel_dw3
 	$(MAKDIR) $(DISK_1_40D),CMDS
+	$(MAKDIR) $(DISK_DW3),CMDS
 	$(CP) $(CMDS) $(DISK_1_40D),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
 	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $(DISK_DW3),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
+	$(CPL) $(TEXTFILES_DW3) $(DISK_DW3),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
+	$(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+	$(RM) tocgen
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),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)
--- a/3rdparty/packages/sierra/spacequest0/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/spacequest0/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -9,20 +12,23 @@
 DISK_3_40D	= spacequest0_d3_40d.dsk
 DISK_1_80D	= spacequest0_d1_80d.dsk
 DISK_2_80D	= spacequest0_d2_80d.dsk
+DISK_DW3	= spacequest0_dw3.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D) $(DISK_DW3)
 
 DISK_1_40D_NAME	= "Space Quest 0 Disk 1"
 DISK_2_40D_NAME	= "Space Quest 0 Disk 2"
 DISK_3_40D_NAME	= "Space Quest 0 Disk 3"
 DISK_1_80D_NAME	= "Space Quest 0 Disk 1"
 DISK_2_80D_NAME	= "Space Quest 0 Disk 2"
+DISK_DW3_NAME	= "Space Quest 0 Disk"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3		= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -41,12 +47,22 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(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
 
 TEXTFILES_D1	= startup tOC_40d.txt
 TEXTFILES	= startup tOC_80d.txt
+TEXTFILES_DW3	= startup tOC_dw3.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
@@ -58,6 +74,9 @@
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 words.tok
 
+SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 words.tok
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
@@ -85,7 +104,9 @@
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
@@ -109,11 +130,36 @@
 	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_1_80D),.
 	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $(DISK_1_80D),.
 	$(CP) $(SUPPORTFILES_D3) $(DISK_2_80D),.
 
-dsk:	dsk_40d dsk_80d
+dsk_dw3:	all
+	$(RM) $(DISK_DW3)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_dw3 kernel_dw3
+	$(MAKDIR) $(DISK_DW3),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_DW3),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW3) $(DISK_DW3),.
+	$(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt
+	$(RM) tocgen
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
+	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+
+dsk:	dsk_40d dsk_80d dsk_dw3
+	$(CD) $(LEVEL2)/coco3; make
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/spacequest1/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -7,18 +10,21 @@
 DISK_1_40D	= spacequest1_d1_40d.dsk
 DISK_2_40D	= spacequest1_d2_40d.dsk
 DISK_80D	= spacequest1_80d.dsk
+DISK_DW3	= spacequest1_dw3.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW3)
 
 DISK_1_40D_NAME	= "Space Quest I Disk 1"
 DISK_2_40D_NAME	= "Space Quest I Disk 2"
 DISK_80D_NAME	= "Space Quest I"
+DISK_DW3_NAME	= "Space Quest I"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3		= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -37,6 +43,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(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
@@ -78,7 +93,9 @@
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 
@@ -100,10 +117,35 @@
 	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 
-dsk:	dsk_40d dsk_80d
+dsk_dw3:	all
+	$(RM) $(DISK_DW3)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_dw3 kernel_dw3
+	$(MAKDIR) $(DISK_DW3),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_DW3),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_DW3),.
+	$(OS9RENAME) $(DISK_DW3),tOC_80d.txt tOC.txt
+	$(RM) tocgen
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
+	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+
+
+dsk:	dsk_40d dsk_80d dsk_dw3
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/spacequest2/makefile	Sun Apr 04 02:22:20 2010 +0000
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Sun Apr 04 02:24:59 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -8,19 +11,22 @@
 DISK_2_40D	= spacequest2_d2_40d.dsk
 DISK_3_40D	= spacequest2_d3_40d.dsk
 DISK_80D	= spacequest2_80d.dsk
+DISK_DW3	= spacequest3_dw3.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DISK_DW3)
 
 DISK_1_40D_NAME = "Space Quest II Disk 1"
 DISK_2_40D_NAME = "Space Quest II Disk 2"
 DISK_3_40D_NAME = "Space Quest II Disk 3"
 DISK_80D_NAME   = "Space Quest II"
+DISK_DW3_NAME   = "Space Quest II"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3		= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -39,6 +45,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.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_dw3 $(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
@@ -82,7 +97,9 @@
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	$(MOVE) toctmp tocgen
 	$(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)
@@ -107,9 +124,34 @@
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(MOVE) tocgen toctmp
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	$(MOVE) toctmp tocgen
 
-dsk:	dsk_40d dsk_80d
+dsk_dw3:	all
+	$(RM) $(DISK_DW3)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
+	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_dw3 kernel_dw3
+	$(MAKDIR) $(DISK_DW3),CMDS
+	$(CP) $(CMDS) $(DISK_DW3),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_DW3),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_DW3),.
+	$(OS9RENAME) $(DISK_DW3),tOC_80d.txt tOC.txt
+	$(RM) tocgen
+	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
+	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+
+
+dsk:	dsk_40d dsk_80d dsk_dw3
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)