Mercurial > hg > Members > kono > nitros9-code

changeset 2495:9296f92ce18c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Permits DW3 build to work. RG
author robertgault
date Sun, 04 Apr 2010 02:19:08 +0000
parents 98e7cb7b3dda
children 78636a6da2b3
files 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile 3rdparty/packages/sierra/kingsquest2/makefile
diffstat 3 files changed, 65 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/goldrush/makefile	Sun Apr 04 02:17:24 2010 +0000
+++ b/3rdparty/packages/sierra/goldrush/makefile	Sun Apr 04 02:19:08 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -79,15 +82,17 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $@,.
+	$(CPL) $(TEXTFILES_DW3) $@,.
 	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $@,.
 	$(CP) $(SUPPORTFILES_D2) $@,.
 	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(RENAME) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 
 $(DISK_1_80D):
 	$(RM) $@
+	$(RENAME) toctmp tocgen
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
 	$(MERGE) $(BOOTFILE_80D)>os9boot
@@ -105,8 +110,10 @@
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(RM) tocgen
 	tocgen $@,tOC.txt $@,tOC
 
+
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Sun Apr 04 02:17:24 2010 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Sun Apr 04 02:19:08 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -73,7 +76,9 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
 $(DSKDW3):
@@ -94,6 +99,7 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(RM) tocgen
 	tocgen $@,tOC.txt $@,tOC
 	$(CP) $(SUPPORTFILES) $@,.
 
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Sun Apr 04 02:17:24 2010 +0000
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Sun Apr 04 02:19:08 2010 +0000
@@ -1,3 +1,6 @@
+ifndef	NITROS9DIR
+NITROS9DIR	= $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../objs_lsl
@@ -7,19 +10,22 @@
 DSK_1_40D	= kingsquest2_d1_40d.dsk
 DSK_2_40D	= kingsquest2_d2_40d.dsk
 DSK_80D		= kingsquest2_80d.dsk
+DSK_DW3          = kingsquest2_dw3.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3)
 
 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"
+DSK_DW3_NAME	= "King's 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
-OS9BOOT_40D	= $(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_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -28,7 +34,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -37,6 +43,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
@@ -63,8 +78,8 @@
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $@ -n$(DSK_1_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot
-	$(MERGE) $(KERNEL)>kernel
+	$(MERGE) $(BOOTFILE_40D)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -77,8 +92,10 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) toctmp tocgen 
 
 $(DSK_2_40D):
 	$(RM) $@
@@ -89,8 +106,8 @@
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $@ -n$(DSK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot
-	$(MERGE) $(KERNEL)>kernel
+	$(MERGE) $(BOOTFILE_80D)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -103,8 +120,33 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DSK_DW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DSK_DW3_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_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $@,.
+	$(RM) tocgen
+	tocgen $@,tOC.txt $@,tOC
+
 
 dsk:	all $(DSKS)