Mercurial > hg > Members > kono > nitros9-code

changeset 2206:612a4ff2e5f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added DW3 disks
author boisy
date Sat, 14 Mar 2009 22:19:06 +0000
parents a0012a9f84eb
children 568b30b074fc
files 3rdparty/packages/rof/makefile 3rdparty/packages/subsim/makefile
diffstat 2 files changed, 102 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/rof/makefile	Sat Mar 14 22:10:09 2009 +0000
+++ b/3rdparty/packages/rof/makefile	Sat Mar 14 22:19:06 2009 +0000
@@ -2,13 +2,15 @@
 
 DEPENDS		= ./makefile
 
-DISK		= rof.dsk
+DSK_FLOPPY	= rof.dsk
+DSK_DW3		= rof_dw3.dsk
 CMDS		= rescue
 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 \
@@ -16,6 +18,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(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)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 SUPPORTFILES	= body heads larms legs lips panel1 rofvar rship.c rtitle.c scores
 
 ALLOBJS		= $(CMDS)
@@ -25,25 +35,44 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK)
+dsk:	all $(DSK_FLOPPY) $(DSK_DW3)
+
+$(DSK_FLOPPY):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_SS35) $(DISK) -n"Rescue on Fractalus"
-	$(MERGE) $(OS9BOOT)>os9boot
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
-	$(RM) os9boot kernel_1773
-	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
-	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
-	$(CP) $(CMDS) $(DISK),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
-	$(OS9RENAME) $(DISK),CMDS/rescue AutoEx
-	$(CP) $(SUPPORTFILES) $(DISK),.
-	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
+	$(OS9FORMAT_SS35) $@ -n"Rescue on Fractalus"
+	$(MERGE) $(BOOTFILE_FLOPPY)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/rescue AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
+$(DSK_DW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS35) $@ -n"Rescue on Fractalus"
+	$(MERGE) $(BOOTFILE_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/rescue AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
-	$(CP) $(DISK) $(DSKDIR)
+	$(CP) $(DSK_FLOPPY) $(DSK_DW3) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK_FLOPPY) $(DSK_DW3)
--- a/3rdparty/packages/subsim/makefile	Sat Mar 14 22:10:09 2009 +0000
+++ b/3rdparty/packages/subsim/makefile	Sat Mar 14 22:19:06 2009 +0000
@@ -2,13 +2,15 @@
 
 DEPENDS		= ./makefile
 
-DISK		= subsim.dsk
+DSK_FLOPPY	= subsim.dsk
+DSK_DW3		= subsim_dw3.dsk
 CMDS		= presub sub sub1 sub2 sub3 sub4 sub5 sub6
 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 \
@@ -16,6 +18,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(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)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 SUPPORTFILES	= control1.cmp convoys.dat diesel.dat fonts.dat germap.cmp \
 		hiscore.dat mission.txt missions.dat radar.dat shipmap2.dat \
 		sintbl.dat stitle.pic sub.dat usamap.cmp status.dat substats.dat 
@@ -27,27 +37,48 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK)
+dsk:	all $(DSK_FLOPPY) $(DSK_DW3)
+
+$(DSK_FLOPPY):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) $(DISK) -n"Sub Battle Simulator"
-	$(MERGE) $(OS9BOOT)>os9boot
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
-	$(RM) os9boot kernel_1773
-	$(MAKDIR) $(DISK),CMDS $(DISK),SUB
-	$(CP) $(CMDS) $(DISK),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
-	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
-	$(OS9RENAME) $(DISK),CMDS/presub AutoEx
-	$(CP) $(SUPPORTFILES) $(DISK),SUB
-	$(CP) sub6 $(DISK),SUB
-	$(OS9ATTR_EXEC) $(DISK),SUB/sub6
-	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),SUB/$(file);)
+	$(OS9FORMAT_DS40) $@ -n"Sub Battle Simulator"
+	$(MERGE) $(BOOTFILE_FLOPPY)>os9boot
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS $@,SUB
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(OS9RENAME) $@,CMDS/presub AutoEx
+	$(CP) $(SUPPORTFILES) $@,SUB
+	$(CP) sub6 $@,SUB
+	$(OS9ATTR_EXEC) $@,SUB/sub6
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
+
+$(DSK_DW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) $@ -n"Sub Battle Simulator"
+	$(MERGE) $(BOOTFILE_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS $@,SUB
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(OS9RENAME) $@,CMDS/presub AutoEx
+	$(CP) $(SUPPORTFILES) $@,SUB
+	$(CP) sub6 $@,SUB
+	$(OS9ATTR_EXEC) $@,SUB/sub6
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
 dskcopy:
-	$(CP) $(DISK) $(DSKDIR)
+	$(CP) $(DSK_FLOPPY) $(DSK_DW3) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK_FLOPPY) $(DSK_DW3)