Mercurial > hg > Members > kono > nitros9-code

changeset 2208:9aa4880f49e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated for DW3
author boisy
date Sat, 14 Mar 2009 23:07:25 +0000
parents 568b30b074fc
children 9341eb8c18f5
files 3rdparty/packages/sierra/christmas86/makefile
diffstat 1 files changed, 55 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/christmas86/makefile	Sat Mar 14 22:30:23 2009 +0000
+++ b/3rdparty/packages/sierra/christmas86/makefile	Sat Mar 14 23:07:25 2009 +0000
@@ -4,17 +4,19 @@
 
 DEPENDS		= ./makefile
 
-DISK_40D	= christmas86.dsk
+DSK_FLOPPY	= christmas86.dsk
+DSK_DW3		= christmas86_dw3.dsk
 
-DISK_40D_NAME	= "Christmas 1986"
+DSK_NAME	= "Christmas 1986"
 
 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_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -23,6 +25,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
@@ -38,29 +49,50 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK_40D) $(DISK_2_40D)
+dsk: $(DSK_FLOPPY) $(DSK_DW3)
+
+$(DSK_FLOPPY):	all
+	$(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$(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);)
 	$(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),.
-	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) $@,.
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DSK_DW3):	all
+	$(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);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	tocgen $@,tOC.txt $@,tOC
+	$(CP) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
-	$(CP) $(DISK_40D) $(DSKDIR)
+	$(CP) $(DSK_FLOPPY) $(DSK_DW3) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK_40D)
+	$(RM) $(DSK_FLOPPY) $(DSK_DW3)