--- 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)