Mercurial > hg > Members > kono > nitros9-code

diff 3rdparty/packages/arcadepak/makefile @ 2774:1868fbf470e7 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5) changeset: 2773:ce3dba57003b branch: lwtools-port tag: tip parent: 2770:bfe3de781ddf user: Boisy Pitre <boisy.pitre@nuance.com> date: Wed Jan 23 14:54:29 2013 -0600 summary: boot_dw now uses dwinit.asm. changeset: 2772:0a3f4d8ea6d5
author Boisy Pitre <boisy.pitre@nuance.com>
date Wed, 23 Jan 2013 21:02:34 -0600
parents 2626a34f4929
children 0f8d54435001
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/arcadepak/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -6,22 +6,27 @@
 CMD		= $(6809L2)/cmds
 DISK_40D	= arcadepack_40d.dsk
 DISK_80D	= arcadepack_80d.dsk
+DISK_DW 	= arcadepack_dw.dsk
+DISK_BECKER	= arcadepack_becker.dsk
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir
 		
-SMASHCMDS	= $(shell $(CD) smash; make showobjs)
-SMASHSYS	= $(shell $(CD) smash; make showsys)
-SMASHROOT	= $(shell $(CD) smash; make showroot)
-THEXCMDS	= $(shell $(CD) thexder; make showobjs)
-THEXSYS		= $(shell $(CD) thexder; make showsys)
-THEXROOT	= $(shell $(CD) thexder; make showroot)
-SHANGCMDS	= $(shell $(CD) shanghai; make showobjs)
-SHANGSYS	= $(shell $(CD) shanghai; make showsys)
-SHANGROOT	= $(shell $(CD) shanghai; make showroot)
+SMASHCMDS	= $(shell $(CD) smash; make --no-print-directory showobjs)
+SMASHSYS	= $(shell $(CD) smash; make --no-print-directory showsys)
+SMASHROOT	= $(shell $(CD) smash; make --no-print-directory showroot)
+THEXCMDS	= $(shell $(CD) thexder; make --no-print-directory showobjs)
+THEXSYS		= $(shell $(CD) thexder; make --no-print-directory showsys)
+THEXROOT	= $(shell $(CD) thexder; make --no-print-directory showroot)
+SHANGCMDS	= $(shell $(CD) shanghai; make --no-print-directory showobjs)
+SHANGSYS	= $(shell $(CD) shanghai; make --no-print-directory showsys)
+SHANGROOT	= $(shell $(CD) shanghai; make --no-print-directory showroot)
 MD		= $(6809L2)/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_40 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW 	= $(MD)/rel_40 $(MD)/boot_dw $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -42,14 +47,36 @@
 		$(MD)/w6.dw $(MD)/w7.dw \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+OS9BOOT_DW 	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
+OS9BOOT_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 ALLOBJS		= $(CMDS)
 
+DSKS		= $(DISK_40D) $(DISK_80D) $(DISK_DW) $(DISK_BECKER)
+
 all: shell
 	$(CD) smash; make
 	$(CD) thexder; make
 	$(CD) shanghai; make
 
-dsk:	$(DISK_40D) $(DISK_80D)
+dsk:	all $(DSKS)
 
 shell:	$(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
@@ -58,6 +85,7 @@
 	@$(ECHO) ""
 
 $(DISK_40D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS40) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_40D)>os9boot
@@ -87,6 +115,7 @@
 	$(CPL) startup $@,
 
 $(DISK_80D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS80) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_80D)>os9boot
@@ -95,7 +124,64 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
 	$(CP) shell $@,CMDS/shell
-	$(RM) shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
+$(DISK_DW): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
+$(DISK_BECKER): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_BECKER)>os9boot
+	$(MERGE) $(KERNEL_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -122,10 +208,10 @@
 	$(CD) shanghai; make clean
 
 dskcopy: dsk
-	$(CP) $(DISK_40D) $(DISK_80D) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK_40D) $(DISK_80D)
+	$(RM) $(DSKS) 
 
 info:
 	@$(ECHO) "*** NitrOS-9 Arcade Pak ***"