Mercurial > hg > Members > kono > nitros9-code

changeset 2228:77f41e861afc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Udated makefiles to make DW3 disks
author boisy
date Sun, 22 Mar 2009 12:21:43 +0000
parents b9fd9c10af89
children 918c7c68ea4d
files 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile
diffstat 2 files changed, 94 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Sat Mar 21 10:51:04 2009 +0000
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Sun Mar 22 12:21:43 2009 +0000
@@ -4,15 +4,15 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kingsquest2_d1_40d.dsk
-DISK_2_40D	= kingsquest2_d2_40d.dsk
-DISK_80D	= kingsquest2_80d.dsk
+DSK_1_40D	= kingsquest2_d1_40d.dsk
+DSK_2_40D	= kingsquest2_d2_40d.dsk
+DSK_80D		= kingsquest2_80d.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D)
 
-DISK_1_40D_NAME	= "King's Quest II Disk 1"
-DISK_2_40D_NAME	= "King's Quest II Disk 2"
-DISK_80D_NAME	= "King's Quest II"
+DSK_1_40D_NAME	= "King's Quest II Disk 1"
+DSK_2_40D_NAME	= "King's Quest II Disk 2"
+DSK_80D_NAME	= "King's Quest II"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
@@ -59,51 +59,54 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D)
+$(DSK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(OS9FORMAT_DS40) -q $@ -n$(DSK_1_40D_NAME)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>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_40D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES_D1) $@,.
 
-dsk_80d:	all
-	$(RM) $(DISK_80D)
+$(DSK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DSK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DSK_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DSK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>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_80D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES) $@,.
 
-dsk:	dsk_40d dsk_80d
+dsk:	all $(DSKS)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sat Mar 21 10:51:04 2009 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Mar 22 12:21:43 2009 +0000
@@ -4,17 +4,19 @@
 
 DEPENDS		= ./makefile
 
-DISK		= leisuresuitlarry.dsk
-DISK_NAME	= "Leisure Suit Larry"
+DSK_FLOPPY	= leisuresuitlarry.dsk
+DSK_DW3		= leisuresuitlarry_dw3.dsk
+DSK_NAME	= "Leisure Suit Larry"
 
-DSKS		= $(DISK)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW3)
 
 CMDS		= sierra mnln scrn shdw
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
-KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-OS9BOOT		= $(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_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -22,6 +24,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(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
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 words.tok
@@ -33,21 +43,39 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DSKS)
+dsk:	all $(DSKS)
+
+$(DSK_FLOPPY):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK) -n$(DISK_NAME)
-	$(MERGE) $(OS9BOOT)>os9boot
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
-	$(RM) os9boot kernel_1773
-	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(CMDS) $(DISK),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
-	$(OS9RENAME) $(DISK),CMDS/sierra AutoEx
-	$(CP) $(SUPPORTFILES) $(DISK),.
-	tocgen tOC.txt $(DISK),tOC
-	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
+	$(OS9FORMAT_DS40) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_FLOPPY)>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);)
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	tocgen tOC.txt $@,tOC
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
+$(DSK_DW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS40) -q $@ -n$(DSK_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);)
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	tocgen tOC.txt $@,tOC
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)