Mercurial > hg > Members > kono > nitros9-code

changeset 1428:7e0ecb2e394a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More improvements for Multi-vue
author boisy
date Wed, 03 Dec 2003 00:32:24 +0000
parents b3868abe1fee
children 44d21b07a99f
files 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/multivue/startup 3rdparty/packages/multivue/sys/env.file
diffstat 5 files changed, 68 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Tue Dec 02 22:35:55 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Wed Dec 03 00:32:24 2003 +0000
@@ -1,13 +1,18 @@
 include ../../../../rules.mak
 
-vpath %.asm $(6809L2)/cmds:../cmds_6809
+vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds:../cmds_6809
 
 AFLAGS		+= -e
 DEPENDS		= ./makefile
 
-CMDS		= grfdrv \
-		gshell cocopr control demo fstat gcal gcalc gclock gport \
-		gprint
+CMDS		= shell utilpak1 grfdrv \
+		gshell cocopr control demo fstat \
+		gcal gcalc gclock gport gprint \
+		backup format free help
+
+SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
+UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
+		merge mfree procs rename sleep tmode
 
 ALLOBJS		= $(CMDS)
 
@@ -16,6 +21,18 @@
 gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
+shell:  $(SHELLMODS) $(DEPENDS)
+	$(MERGE) $(SHELLMODS)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
+utilpak1: $(UTILPAK1) $(DEPENDS)
+	$(MERGE) $(UTILPAK1)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
 clean:
 	$(RM) $(ALLOBJS)
 
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Tue Dec 02 22:35:55 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Wed Dec 03 00:32:24 2003 +0000
@@ -1,12 +1,17 @@
 include ../../../../rules.mak
 
-vpath %.asm $(6809L2)/cmds
+vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds
 
 DEPENDS		= ./makefile
 
-CMDS		= grfdrv \
-		gshell cocopr control demo fstat gcal gcalc gclock gport \
-		gprint
+CMDS		= shell utilpak1 grfdrv \
+		gshell cocopr control demo fstat \
+		gcal gcalc gclock gport gprint \
+		backup format free help
+
+SHELLMODS       = shellplus date deiniz echo iniz link load save unlink
+UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
+		merge mfree procs rename sleep tmode
 
 ALLOBJS		= $(CMDS)
 
@@ -15,6 +20,18 @@
 gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
+shell:	$(SHELLMODS) $(DEPENDS)
+	$(MERGE) $(SHELLMODS)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
+utilpak1: $(UTILPAK1) $(DEPENDS)
+	$(MERGE) $(UTILPAK1)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
 clean:
 	$(RM) $(ALLOBJS)
 
--- a/3rdparty/packages/multivue/makefile	Tue Dec 02 22:35:55 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Wed Dec 03 00:32:24 2003 +0000
@@ -8,28 +8,35 @@
 SYSBIN	= $(shell $(CD) sys; make showbinobjs)
 SYSTEXT	= $(shell $(CD) sys; make showtextobjs)
 DEMO	= aif.dmo
+ROOTFILES = startup
 
 MD68	= $(6809L2)/modules
 MD63	= $(6309L2)/modules
 
-KERNEL68	= $(MD68)/rel_32 $(MD68)/boot_1773_6ms $(MD68)/kernel
-KERNEL63	= $(MD63)/rel_32 $(MD63)/boot_1773_6ms $(MD63)/kernel
+KERNEL68	= $(MD68)/rel_40 $(MD68)/boot_1773_6ms $(MD68)/kernel
+KERNEL63	= $(MD63)/rel_40 $(MD63)/boot_1773_6ms $(MD63)/kernel
 
-OS9BOOT68	= $(MD68)/rel_32 $(MD68)/ioman $(MD68)/init \
+OS9BOOT68	= $(MD68)/kernelp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
-		$(MD68)/cc3disk.dr $(MD63)/ddd0_40d.dd \
+		$(MD68)/cc3disk.dr $(MD68)/ddd0_40d.dd \
+		$(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
 		$(MD68)/scf.mn $(MD68)/cc3io.dr \
 		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
 		$(MD68)/windint.io $(MD68)/term_win40.dt \
+		$(MD68)/w.dw $(MD68)/w1.dw $(MD68)/w2.dw $(MD68)/w3.dw \
+		$(MD68)/w4.dw $(MD68)/w5.dw $(MD68)/w6.dw $(MD68)/w7.dw \
 		$(MD68)/clock_60hz $(MD68)/clock2_soft \
 		$(MD68)/sysgo_dd
 
-OS9BOOT63	= $(MD63)/rel_32 $(MD63)/ioman $(MD63)/init \
+OS9BOOT63	= $(MD63)/kernelp2 $(MD63)/ioman $(MD63)/init \
 		$(MD63)/rbf.mn \
 		$(MD63)/cc3disk.dr $(MD63)/ddd0_40d.dd \
+		$(MD63)/d0_40d.dd $(MD63)/d1_40d.dd \
 		$(MD63)/scf.mn $(MD63)/cc3io.dr \
 		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
 		$(MD63)/windint.io $(MD63)/term_win40.dt \
+		$(MD63)/w.dw $(MD63)/w1.dw $(MD63)/w2.dw $(MD63)/w3.dw \
+		$(MD63)/w4.dw $(MD63)/w5.dw $(MD63)/w6.dw $(MD63)/w7.dw \
 		$(MD63)/clock_60hz $(MD63)/clock2_soft \
 		$(MD63)/sysgo_dd
 
@@ -73,6 +80,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK68),SYS/$(file);)
 	$(CD) demo; $(CPL) $(DEMO) ../$(DISK68),DEMO
 	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK68),DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $(DISK68),.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $(DISK68),$(file);)
 	$(RM) $(DISK63)
 	$(OS9FORMAT_DS40) $(DISK63) -q -n"Multi-Vue"
 	$(MERGE) $(OS9BOOT63)>os9boot
@@ -94,6 +103,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK63),SYS/$(file);)
 	$(CD) demo; $(CPL) $(DEMO) ../$(DISK63),DEMO
 	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK63),DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $(DISK63),.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $(DISK63),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK68) $(DSKDIR)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/multivue/startup	Wed Dec 03 00:32:24 2003 +0000
@@ -0,0 +1,8 @@
+* Echo welcome message
+echo *     Welcome to Multi-Vue    *
+echo *   on the Color Computer 3   *
+* Lock shell and std utils into memory
+link shell
+load utilpak1
+* Merge fonts, pointers and patterns
+merge sys/stdfonts sys/stdptrs sys/stdpats_2 sys/stdpats_4 sys/stdpats_16
--- a/3rdparty/packages/multivue/sys/env.file	Tue Dec 02 22:35:55 2003 +0000
+++ b/3rdparty/packages/multivue/sys/env.file	Wed Dec 03 00:32:24 2003 +0000
@@ -1,8 +1,8 @@
 RBFDEV=/DD,/D0,/D1
 SCFDEV=/p,/t1
 MONTYPE=1
-RAM=128
-*RAM=512
+*RAM=128
+RAM=512
 EXEC=/DD/CMDS
 *PROGRAM=Shell
 *PARAM=i=/term