Mercurial > hg > Members > kono > nitros9-code
changeset 3267:024ad1d926fd
Get gfx2 to build from cmds folders
Now that gfx2.asm needs to include coco3vtio.d the latter needs to be
built first and be accessed from the port-specific defs folder.
OTOH the one built in 3rd-party/packages/basic09 is built only later
during a full build.
(All the different defs folders and .d files still puzzle me.)
Also updated coco3fpga/defs/makefile to be based on the coco3 one.
The mc09l2 port doesn't need gfx and gfx2.
Note for later:
This whole build of basic09 components from the 3rdparty folder
during the ports builds is not very nice. At a minimum we should
try to limit the extra --includedir to the few commands needing it.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Wed, 17 Jul 2019 01:14:55 +0200 |
| parents | d9e01e3952e4 |
| children | 647774d06c41 |
| files | level2/coco3/cmds/makefile level2/coco3/makefile level2/coco3fpga/defs/makefile level2/coco3fpga/makefile level2/mc09l2/cmds/makefile level3/coco3/cmds/makefile level3/coco3/makefile |
| diffstat | 7 files changed, 10 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/level2/coco3/cmds/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level2/coco3/cmds/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -5,6 +5,7 @@ DEPENDS = ./makefile AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 +AFLAGS += --includedir=../defs LFLAGS += -L$(NITROS9DIR)/lib ifdef H6309 LFLAGS += -lcoco3_6309
--- a/level2/coco3/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level2/coco3/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -29,7 +29,7 @@ KERNELFILE_DIRECTMODEMPAK = bootfiles/kernel_directmodempak KERNELFILE_ARDUINO = bootfiles/kernel_arduino KERNELFILE_COCOSDC = bootfiles/kernel_cocosdc -DIRS = cmds modules defs sys bootfiles wwwroot +DIRS = defs cmds modules sys bootfiles wwwroot CMDS = $(shell $(CD) cmds; make --no-print-directory showobjs) CMDS_D2 = $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
--- a/level2/coco3fpga/defs/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level2/coco3fpga/defs/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -1,32 +1,2 @@ -PORT = coco3fpga -include $(NITROS9DIR)/rules.mak - -DEPENDS = ./makefile - -DEFOPTS = --preprocess -DLevel=2 -PERMDEFS = Defsfile -DEFS = os9defs rbfdefs scfdefs cocodefs vtiodefs -ALLOBJS = $(DEFS) $(PERMDEFS) - -all: $(ALLOBJS) - -os9defs: $(DEFSDIR)/os9.d - $(AS) $(AFLAGS) $(DEFOPTS) -DOS9.D=0 $< > $@ - -rbfdefs: $(DEFSDIR)/rbf.d - $(AS) $(AFLAGS) $(DEFOPTS) -DRBF.D=0 $< > $@ - -scfdefs: $(DEFSDIR)/scf.d - $(AS) $(AFLAGS) $(DEFOPTS) -DSCF.D=0 $< > $@ - -cocodefs: $(DEFSDIR)/coco.d - $(AS) $(AFLAGS) $(DEFOPTS) -DCOCO.D=0 $< > $@ - -vtiodefs: $(DEFSDIR)/cocovtio.d - $(AS) $(AFLAGS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@ - -clean: - $(RM) $(DEFS) - -showobjs: - @$(ECHO) $(ALLOBJS) +include ../../coco3/defs/makefile +AFLAGS += -DH6309=0 -DCC3FPGA=1 -DALTCOLOR=1
--- a/level2/coco3fpga/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level2/coco3fpga/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -15,7 +15,7 @@ BOOTFILE_COCO3FPGA_ROM_DW = bootfiles/bootfile_coco3fpga_rom_dw BOOTFILE_COCO3FPGA_ROM_RTC = bootfiles/bootfile_coco3fpga_rom_rtc KERNELFILE_BECKER = bootfiles/kernel_becker -DIRS = cmds modules defs sys bootfiles wwwroot +DIRS = defs cmds modules sys bootfiles wwwroot CMDS = $(shell $(CD) cmds; make --no-print-directory showobjs) CMDS_D2 = $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
--- a/level2/mc09l2/cmds/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level2/mc09l2/cmds/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -6,6 +6,7 @@ DEPENDS = ./makefile AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 +AFLAGS += --includedir=../defs LFLAGS += -L$(NITROS9DIR)/lib LFLAGS += -lmc09 LFLAGS += -lnet -lalib @@ -18,7 +19,7 @@ pmap proc procs prompt pwd pxd reboot rename save setime \ shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode -CMDS_D2 = basic09 runb gfx2 gfx inkey syscall copy del echo format \ +CMDS_D2 = basic09 runb inkey syscall copy del echo format \ merge os9gen prompt tmode CMDS_DW = inetd dw telnet httpd
--- a/level3/coco3/cmds/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level3/coco3/cmds/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -4,7 +4,8 @@ vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09 DEPENDS = ./makefile -AFLAGS += -I=$(3RDPARTY)/packages/basic09 +AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 +AFLAGS += --includedir=../defs CMDS = asm attr backup binex build cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
--- a/level3/coco3/makefile Mon Jul 15 14:39:00 2019 -0500 +++ b/level3/coco3/makefile Wed Jul 17 01:14:55 2019 +0200 @@ -11,7 +11,7 @@ KERNELFILE = bootfiles/kernel_1773 KERNELFILE_50HZ = bootfiles/kernel_1773_50hz KERNELFILE_DW = bootfiles/kernel_dw -DIRS = cmds modules defs sys bootfiles +DIRS = defs cmds modules sys bootfiles CMDS = $(shell $(CD) cmds; make --no-print-directory showobjs) CMDS_D2 = $(shell $(CD) cmds; make --no-print-directory showobjs_d2)