Mercurial > hg > Members > kono > nitros9-code

changeset 2492:f8888442a156

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile incorrectly used obj_lsl. Changed to obj directory. RG
author robertgault
date Sat, 03 Apr 2010 19:29:06 +0000
parents 15f5d59508b0
children 9440c9fcf5e9
files 3rdparty/packages/sierra/kingsquest3/makefile
diffstat 1 files changed, 46 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Sat Apr 03 14:36:43 2010 +0000
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Sat Apr 03 19:29:06 2010 +0000
@@ -1,6 +1,9 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm ../objs_lsl
+vpath %.asm ../objs
 
 DEPENDS		= ./makefile
 
@@ -8,19 +11,23 @@
 DISK_2_40D	= kingquest3_d2_40d.dsk
 DISK_3_40D	= kingquest3_d3_40d.dsk
 DISK_80D	= kingquest3_80d.dsk
+DSK_DW3	= kingsquest3_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) $(DSK_DW3)
 
 DISK_1_40D_NAME = "King's Quest III Disk 1"
 DISK_2_40D_NAME = "King's Quest III Disk 2"
 DISK_3_40D_NAME = "King's Quest III Disk 3"
 DISK_80D_NAME   = "King's Quest III"
+DSK_DW3_NAME	= "King's Quest III"
 
 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,12 +46,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_40d.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.3 vol.4 vol.12 vol.14 words.tok
@@ -83,6 +100,7 @@
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(RENAME) tocgen toctmp
 	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),.
@@ -91,6 +109,7 @@
 
 dsk_80d:	all
 	$(RM) $(DISK_80D)
+	$(RENAME) toctmp tocgen
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
@@ -108,9 +127,33 @@
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(RENAME) tocgen toctmp
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 
-dsk:	dsk_40d dsk_80d
+dsk_dw3:	all
+	$(RM) $(DSK_DW3)
+	$(RENAME) toctmp tocgen
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $(DSK_DW3) -n$(DSK_DW3_NAME)
+	$(MERGE) $(BOOTFILE_DW3)>os9boot_dw3
+	$(MERGE) $(KERNEL_DW3)>kernel_dw3
+	$(OS9GEN) $(DSK_DW3) -b=os9boot_dw3 -t=kernel_dw3
+	$(RM) os9boot_dw3 kernel_dw3
+	$(MAKDIR) $(DSK_DW3),CMDS
+	$(CP) $(CMDS) $(DSK_DW3),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DSK_DW3),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DSK_DW3),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW3),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW3) $(DSK_DW3),.
+	$(OS9RENAME) $(DSK_DW3),tOC_DW3.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW3),.
+	$(RM) tocgen
+	tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC
+
+dsk:	dsk_40d dsk_80d dsk_dw3
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)