Mercurial > hg > Members > kono > nitros9-code

changeset 2219:94ccee3fceda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated makefiles
author boisy
date Tue, 17 Mar 2009 20:00:21 +0000
parents 7ba4d9a816af
children 0ca50708370b
files 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile
diffstat 2 files changed, 127 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/goldrush/makefile	Tue Mar 17 15:51:36 2009 +0000
+++ b/3rdparty/packages/sierra/goldrush/makefile	Tue Mar 17 20:00:21 2009 +0000
@@ -4,22 +4,25 @@
 
 DEPENDS		= ./makefile
 
+DSKDW3		= goldrush_dw3.dsk
 DISK_1_80D	= goldrush_d1_80d.dsk
 DISK_2_80D	= goldrush_d2_80d.dsk
 DISK_3_80D	= goldrush_d3_80d.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW3)
 
 DISK_1_80D_NAME = "Gold Rush Disk 1"
 DISK_2_80D_NAME = "Gold Rush Disk 2"
-DISK_3_80D_NAME = "Gold Rush Disk 3"
+DISK_3_80D_NAME = "Gold Rush d1_80dDisk 3"
+DSKDW3_NAME	= "Gold Rush"
 
 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
-OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+BOOTFILE_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -28,12 +31,21 @@
 		$(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_D1	= startup tOC_80d.txt tOC_dw3.txt
+TEXTFILES	= startup tOC_80d.txt 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
@@ -49,30 +61,63 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+dsk:	all $(DSKDW3) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+
+$(DSKDW3):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_1_80D),CMDS
-	$(CP) $(CMDS) $(DISK_1_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
+	$(OS9FORMAT_DW3) -q $@ -n$(DSKDW3_NAME)
+	$(MERGE) $(BOOTFILE_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_80D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
-	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
-	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),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)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(CPL) $(TEXTFILES_D2) $@,.
+	$(CPL) $(TEXTFILES_D3) $@,.
+	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(CP) $(SUPPORTFILES_D3) $@,.
+	tocgen $@,tOC.txt $@,tOC
+
+$(DISK_1_80D):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
+	$(MERGE) $(BOOTFILE_80D)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot_80d os9boot_80d kernel_1773
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	tocgen $@,tOC.txt $@,tOC
+
+$(DISK_2_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Tue Mar 17 15:51:36 2009 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Tue Mar 17 20:00:21 2009 +0000
@@ -5,18 +5,21 @@
 DEPENDS		= ./makefile
 
 DISK_40D	= kingsquest1_40d.dsk
+DSKDW3		= kingsquest1_dw3.dsk
 
-DSKS		= $(DISK_40D)
+DSKS		= $(DISK_40D) $(DSKDW3)
 
 DISK_40D_NAME	= "King's Quest I"
+DSKDW3_NAME	= $(DISK_40D_NAME)
 
 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_FLOPPY	= $(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 \
+BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -25,6 +28,15 @@
 		$(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
@@ -41,27 +53,49 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_40D)
+dsk:	all $(DISK_40D) $(DSKDW3)
+
+$(DISK_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_40D) -n$(DISK_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d kernel_1773
-	$(MAKDIR) $(DISK_40D),CMDS
-	$(CP) $(CMDS) $(DISK_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_40D),CMDS/$(file);)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_40D)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_40D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_40D),.
-	$(OS9RENAME) $(DISK_40D),tOC_40d.txt tOC.txt
-	tocgen $(DISK_40D),tOC.txt $(DISK_40D),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_40D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DSKDW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)