Mercurial > hg > Members > kono > nitros9-code
changeset 2064:c8bb06c82d68
Changes for new NitrOS-9 directory structure
| author | boisy |
|---|---|
| date | Fri, 05 May 2006 15:26:03 +0000 |
| parents | 5215fb9c6f0f |
| children | 3bd91f399082 |
| files | 3rdparty/packages/deskmate3/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/multivue/sys/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/subsim/makefile |
| diffstat | 13 files changed, 42 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdparty/packages/deskmate3/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/deskmate3/makefile Fri May 05 15:26:03 2006 +0000 @@ -2,8 +2,8 @@ DISK = deskmate3.dsk -CD68 = $(LEVEL2)/coco3/6809/cmds -MD68 = $(LEVEL2)/coco3/6809/modules +CD68 = $(LEVEL2)/coco3/cmds +MD68 = $(LEVEL2)/coco3/modules UTILS = $(CD68)/shell $(CD68)/format $(CD68)/rename CMDS = accdata autoex desk dmalt dmapps dmbackup dmcaln dmcards dmdskini \
--- a/3rdparty/packages/fsim2/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/fsim2/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = fsim2.dsk CMDS = fs f2 f3 f4 -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -29,14 +29,14 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_SS35) $(DISK) -n"Flight Simulator 2" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 $(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773 $(RM) os9boot kernel_1773 $(MAKDIR) $(DISK),CMDS - $(CP) $(6809L2)/CMDS/shell_21 $(DISK),CMDS/shell + $(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);)
--- a/3rdparty/packages/koronis/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/koronis/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = koronis.dsk CMDS = koronis -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -31,14 +31,14 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_SS35) $(DISK) -n"Koronis Rift" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 $(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773 $(RM) os9boot kernel_1773 $(MAKDIR) $(DISK),CMDS - $(CP) $(6809L2)/cmds/shell_21 $(DISK),CMDS/shell + $(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);)
--- a/3rdparty/packages/kyumgai/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/kyumgai/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = kyumgai.dsk CMDS = ninja ninja.snd1 ninja.snd2 -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -33,14 +33,14 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_DS40) $(DISK) -n"Kyum-Gai: To Be Ninja" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 $(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773 $(RM) os9boot kernel_1773 $(MAKDIR) $(DISK),CMDS - $(CP) $(6809L2)/cmds/shell_21 $(DISK),CMDS/shell + $(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);)
--- a/3rdparty/packages/mm/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/mm/makefile Fri May 05 15:26:03 2006 +0000 @@ -5,7 +5,7 @@ DISK = mm.dsk CMDS = mm mod1.dat mod2.dat mod3.dat mod4.dat mod5.dat \ mod6.sbr mod7.sbr mod8.sbr -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -28,14 +28,14 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_DS40) $(DISK) -n"Microscopic Mission" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 $(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773 $(RM) os9boot kernel_1773 $(MAKDIR) $(DISK),CMDS - $(CP) $(6809L2)/cmds/shell_21 $(DISK),CMDS/shell + $(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);)
--- a/3rdparty/packages/multivue/cmds_6309/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/multivue/cmds_6309/makefile Fri May 05 15:26:03 2006 +0000 @@ -1,13 +1,14 @@ -include ../../../../rules.mak +include $(NITROS9DIR)/rules.mak vpath %.asm ../cmds_6809 AFLAGS += -e DEPENDS = ./makefile -OSCMDS = $(6309L2)/cmds/shell $(6309L2)/cmds/utilpak1 \ - $(6309L2)/cmds/grfdrv $(6309L2)/cmds/backup \ - $(6309L2)/cmds/format $(6309L2)/cmds/free $(6309L2)/cmds/help +OSCMDS = $(LEVEL2)/coco3_6309/cmds/shell $(LEVEL2)/coco3_6309/cmds/utilpak1 \ + $(LEVEL2)/coco3_6309/cmds/grfdrv $(LEVEL2)/coco3_6309/cmds/backup \ + $(LEVEL2)/coco3_6309/cmds/format $(LEVEL2)/coco3_6309/cmds/free \ + $(LEVEL2)/coco3_6309/cmds/help CMDS = gshell cocopr control demo fstat \ gcal gcalc gclock gport gprint gsort @@ -16,7 +17,7 @@ all: cmds $(ALLOBJS) cmds: - $(CD) $(6309L2)/cmds; make + $(CD) $(LEVEL2)/coco3_6309/cmds; make gshell: gshell.asm $(AS) $(ASOUT)$@ $< $(AFLAGS)
--- a/3rdparty/packages/multivue/cmds_6809/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/multivue/cmds_6809/makefile Fri May 05 15:26:03 2006 +0000 @@ -2,9 +2,9 @@ DEPENDS = ./makefile -OSCMDS = $(6809L2)/cmds/shell $(6809L2)/cmds/utilpak1 \ - $(6809L2)/cmds/grfdrv $(6809L2)/cmds/backup \ - $(6809L2)/cmds/format $(6809L2)/cmds/free $(6809L2)/cmds/help +OSCMDS = $(LEVEL2)/coco3/cmds/shell $(LEVEL2)/coco3/cmds/utilpak1 \ + $(LEVEL2)/coco3/cmds/grfdrv $(LEVEL2)/coco3/cmds/backup \ + $(LEVEL2)/coco3/cmds/format $(LEVEL2)/coco3/cmds/free $(LEVEL2)/coco3/cmds/help CMDS = gshell cocopr control demo fstat \ gcal gcalc gclock gport gprint gsort @@ -13,7 +13,7 @@ all: cmds $(ALLOBJS) cmds: - $(CD) $(6809L2)/cmds; make + $(CD) $(LEVEL2)/coco3/cmds; make gshell: gshell.asm $(AS) $(ASOUT)$@ $< $(AFLAGS)
--- a/3rdparty/packages/multivue/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/multivue/makefile Fri May 05 15:26:03 2006 +0000 @@ -1,4 +1,4 @@ -include ../../../rules.mak +include $(NITROS9DIR)/rules.mak DISK68 = multivue_6809.dsk DISK63 = multivue_6309.dsk @@ -10,8 +10,8 @@ DEMO = aif.dmo ROOTFILES = startup -MD68 = $(6809L2)/modules -MD63 = $(6309L2)/modules +MD68 = $(LEVEL2)/coco3/modules +MD63 = $(LEVEL2)/coco3_6309/modules KERNEL68 = $(MD68)/rel_40 $(MD68)/boot_1773_6ms $(MD68)/krn KERNEL63 = $(MD63)/rel_40 $(MD63)/boot_1773_6ms $(MD63)/krn
--- a/3rdparty/packages/multivue/sys/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/multivue/sys/makefile Fri May 05 15:26:03 2006 +0000 @@ -1,6 +1,6 @@ include ../../../../rules.mak -vpath %.asm $(6809L2)/sys +vpath %.asm $(LEVEL2)/sys DEPENDS = ./makefile
--- a/3rdparty/packages/rof/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/rof/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = rof.dsk CMDS = rescue -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -27,14 +27,14 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_SS35) $(DISK) -n"Rescue on Fractalus" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 - $(OS9GEN) $(DISK) -t=os9boot -b=kernel_1773 + $(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773 $(RM) os9boot kernel_1773 $(MAKDIR) $(DISK),CMDS - $(CP) $(6809L2)/CMDS/shell_21 $(DISK),CMDS/shell + $(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);)
--- a/3rdparty/packages/sierra/kingsquest3/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/sierra/kingsquest3/makefile Fri May 05 15:26:03 2006 +0000 @@ -7,7 +7,7 @@ DISK_3_40D = kq3_d3_40d.dsk DISK_80D = kq3_80d.dsk CMDS = sierra mnln scrn shdw tocgen -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -29,9 +29,9 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd -BOOTCMDS = $(6809L2)/cmds/shell_21 $(6809L2)/cmds/date \ - $(6809L2)/cmds/echo $(6809L2)/cmds/link \ - $(6809L2)/cmds/setime +BOOTCMDS = $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \ + $(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \ + $(LEVEL2)/coco3/cmds/setime TEXTFILES_D1 = startup tOC_40d.txt TEXTFILES = startup tOC_80d.txt @@ -58,7 +58,7 @@ dsk: all $(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_DS40) -q $(DISK_1_40D) -n"King's Quest III Disk 1" $(OS9FORMAT_DS80) -q $(DISK_80D) -n"King's Quest III" $(MERGE) $(OS9BOOT_40D)>os9boot_40d
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = lsl.dsk CMDS = sierra mnln scrn shdw -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -29,7 +29,7 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_DS40) $(DISK) -n"Leisure Suit Larry" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773
--- a/3rdparty/packages/subsim/makefile Tue Apr 25 21:54:15 2006 +0000 +++ b/3rdparty/packages/subsim/makefile Fri May 05 15:26:03 2006 +0000 @@ -4,7 +4,7 @@ DISK = subsim.dsk CMDS = presub sub sub1 sub2 sub3 sub4 sub5 sub6 -MD = $(6809L2)/modules +MD = $(LEVEL2)/coco3/modules # We make our own bootfile and kernel track KERNEL = $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn @@ -29,7 +29,7 @@ dsk: all $(RM) $(DISK) - $(CD) $(6809L2); make + $(CD) $(LEVEL2)/coco3; make $(OS9FORMAT_DS40) $(DISK) -n"Sub Battle Simulator" $(MERGE) $(OS9BOOT)>os9boot $(MERGE) $(KERNEL)>kernel_1773 @@ -38,7 +38,7 @@ $(MAKDIR) $(DISK),CMDS $(DISK),SUB $(CP) $(CMDS) $(DISK),CMDS $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);) - $(CP) $(6809L2)/cmds/shell_21 $(DISK),CMDS/shell + $(CP) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell $(OS9ATTR_EXEC) $(DISK),CMDS/shell $(OS9RENAME) $(DISK),CMDS/presub AutoEx $(CP) $(SUPPORTFILES) $(DISK),SUB