changeset 2498:4d2c295061dc

Permits DW3 build to work. Minor change so Rules don't need to change. RG
author robertgault
date Sun, 04 Apr 2010 02:22:20 +0000
parents ecc6f5065e45
children 2033e76ae3c0
files 3rdparty/packages/sierra/kingsquest4/makefile
diffstat 1 files changed, 38 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Sun Apr 04 02:21:17 2010 +0000
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Sun Apr 04 02:22:20 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	= kingsquest4_d1_80d.dsk
 DISK_2_80D	= kingsquest4_d2_80d.dsk
 DISK_3_80D	= kingsquest4_d3_80d.dsk
+DISK_DW3	= kingsquest4_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 = "King's Quest IV Disk 1"
 DISK_2_80D_NAME = "King's Quest IV Disk 2"
 DISK_3_80D_NAME = "King's Quest IV Disk 3"
+DISK_DW3_NAME =	"King's Quest IV Disk 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
 
+BOOTFILE_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.6 vol.9 vol.11 words.tok
@@ -42,6 +58,10 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.4 vol.5 vol.10 vol.11
 
+SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 vol.4 vol.5 vol.6 vol.9 vol.10 \
+		vol.11 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)
 	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
+	$(MERGE) $(BOOTFILE_DW3)>os9boot_dw3
+	$(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),.
 	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW3) $(DISK_DW3),.
+	$(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)