From def32eda19f34aa3fd75dff166f1179310174191 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 19:34:37 -0800 Subject: [PATCH 1/8] Update build.yml Added "make clean" which will remove temporary files without removing final binary outputs. --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6dfbb0a..2eadb3ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,7 @@ jobs: - name: Build run: | make + make clean rm -rf .git - name: Upload Archive uses: actions/upload-artifact@v1 From 158658c3fc5d5f5a84261e63efbffdcd2fc1fd0f Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 19:47:33 -0800 Subject: [PATCH 2/8] Update Makefile Build all ROM variants by default in Linux/Mac build. --- Source/HBIOS/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index fa07785f..c1e7a716 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,6 +1,6 @@ OBJECTS = -ifeq (1,0) +ifeq (1,1) OBJECTS += DYNO_std.rom OBJECTS += EZZ80_std.rom OBJECTS += MK4_std.rom @@ -17,9 +17,10 @@ OBJECTS += SCZ180_126.rom OBJECTS += SCZ180_130.rom OBJECTS += UNA_std.rom OBJECTS += ZETA_std.rom -endif - OBJECTS += ZETA2_std.rom +else +OBJECTS += ZETA2_std.rom +endif MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \ From eebed062ad5e95455bbd6cbee25a07a8de79f91a Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 20:22:12 -0800 Subject: [PATCH 3/8] Update Makefile --- Source/HBIOS/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index c1e7a716..9587c33b 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,6 +1,6 @@ OBJECTS = -ifeq (1,1) +ifeq (1,0) OBJECTS += DYNO_std.rom OBJECTS += EZZ80_std.rom OBJECTS += MK4_std.rom @@ -27,18 +27,18 @@ MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \ game.bin usrrom.bin -SUBDIRS = -DEST = ../../Binary -TOOLS =../../Tools -OTHERS = *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc RomDisk.tmp font*.asm -include $(TOOLS)/Makefile.inc +SUBDIRS = +DEST = ../../Binary +TOOLS =../../Tools +OTHERS = *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc RomDisk.tmp font*.asm +include $(TOOLS)/Makefile.inc ifeq ($(DIFFMAKE),1) DIFFBUILD := -d $(DIFFTO)/Source/HBIOS endif DIFFPATH = $(DIFFTO)/Binary - + ROMSIZE=512 @@ -47,8 +47,8 @@ N8_std.rom: ROMSIZE=512 %.rom: bash Build.sh $(DIFFBUILD) $(shell echo $* | tr '_' ' ') $(ROMSIZE) -#ZETA2_std.rom: -# bash Build.sh ZETA2 std 512 +#ZETA2_std.rom: +# bash Build.sh ZETA2 std 512 hbios_rom.bin: hbios.asm build.inc $(TASM) -dROMBOOT hbios.asm hbios_rom.bin hbios_rom.lst From d427fee7ee5da3229c8613334ecc4e45583833ea Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 20:27:40 -0800 Subject: [PATCH 4/8] Update Makefile --- Source/HBIOS/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 9587c33b..ca6f8606 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,6 +1,6 @@ OBJECTS = -ifeq (1,0) +ifeq (1,1) OBJECTS += DYNO_std.rom OBJECTS += EZZ80_std.rom OBJECTS += MK4_std.rom From d3d7225a7924c17972e0d182c0d2917a1075f9d8 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 20:45:22 -0800 Subject: [PATCH 5/8] Update Makefile --- Source/HBIOS/Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index ca6f8606..361481c6 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,25 +1,26 @@ OBJECTS = -ifeq (1,1) -OBJECTS += DYNO_std.rom -OBJECTS += EZZ80_std.rom -OBJECTS += MK4_std.rom +ifeq (1,0) +OBJECTS += DYNO_std.rom +OBJECTS += EZZ80_std.rom +OBJECTS += MK4_std.rom OBJECTS += N8_std.rom -OBJECTS += RCZ180_ext.rom -OBJECTS += RCZ180_nat.rom +OBJECTS += RCZ180_ext.rom +OBJECTS += RCZ180_nat.rom OBJECTS += RCZ80_kio.rom -OBJECTS += RCZ80_mt.rom -OBJECTS += RCZ80_std.rom -OBJECTS += RCZ80_wiz.rom +OBJECTS += RCZ80_mt.rom +OBJECTS += RCZ80_std.rom +OBJECTS += RCZ80_wiz.rom OBJECTS += SBC_simh.rom OBJECTS += SBC_std.rom -OBJECTS += SCZ180_126.rom -OBJECTS += SCZ180_130.rom +OBJECTS += SCZ180_126.rom +OBJECTS += SCZ180_130.rom OBJECTS += UNA_std.rom OBJECTS += ZETA_std.rom -OBJECTS += ZETA2_std.rom +OBJECTS += ZETA2_std.rom else -OBJECTS += ZETA2_std.rom +OBJECTS += ZETA_std.rom +OBJECTS += ZETA2_std.rom endif MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ From fd5a035453ed27b6c915ea58f13d365528ad8255 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 20:55:58 -0800 Subject: [PATCH 6/8] Update Makefile --- Source/HBIOS/Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 361481c6..35cbc56a 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,23 +1,23 @@ OBJECTS = -ifeq (1,0) +ifeq (1,1) OBJECTS += DYNO_std.rom OBJECTS += EZZ80_std.rom OBJECTS += MK4_std.rom -OBJECTS += N8_std.rom -OBJECTS += RCZ180_ext.rom -OBJECTS += RCZ180_nat.rom -OBJECTS += RCZ80_kio.rom -OBJECTS += RCZ80_mt.rom -OBJECTS += RCZ80_std.rom -OBJECTS += RCZ80_wiz.rom -OBJECTS += SBC_simh.rom -OBJECTS += SBC_std.rom -OBJECTS += SCZ180_126.rom -OBJECTS += SCZ180_130.rom -OBJECTS += UNA_std.rom -OBJECTS += ZETA_std.rom -OBJECTS += ZETA2_std.rom +#OBJECTS += N8_std.rom +#OBJECTS += RCZ180_ext.rom +#OBJECTS += RCZ180_nat.rom +#OBJECTS += RCZ80_kio.rom +#OBJECTS += RCZ80_mt.rom +#OBJECTS += RCZ80_std.rom +#OBJECTS += RCZ80_wiz.rom +#OBJECTS += SBC_simh.rom +#OBJECTS += SBC_std.rom +#OBJECTS += SCZ180_126.rom +#OBJECTS += SCZ180_130.rom +#OBJECTS += UNA_std.rom +#OBJECTS += ZETA_std.rom +#OBJECTS += ZETA2_std.rom else OBJECTS += ZETA_std.rom OBJECTS += ZETA2_std.rom From 29457ea21467411ee557525c481ac77edecf8619 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 21:08:35 -0800 Subject: [PATCH 7/8] Update Makefile --- Source/HBIOS/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 35cbc56a..e457bb7a 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -4,11 +4,11 @@ ifeq (1,1) OBJECTS += DYNO_std.rom OBJECTS += EZZ80_std.rom OBJECTS += MK4_std.rom -#OBJECTS += N8_std.rom -#OBJECTS += RCZ180_ext.rom -#OBJECTS += RCZ180_nat.rom -#OBJECTS += RCZ80_kio.rom -#OBJECTS += RCZ80_mt.rom +OBJECTS += N8_std.rom +OBJECTS += RCZ180_ext.rom +OBJECTS += RCZ180_nat.rom +OBJECTS += RCZ80_kio.rom +OBJECTS += RCZ80_mt.rom #OBJECTS += RCZ80_std.rom #OBJECTS += RCZ80_wiz.rom #OBJECTS += SBC_simh.rom From 2f21caca71957cacb2f8deea02a9909afa63408f Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 28 Feb 2020 21:20:54 -0800 Subject: [PATCH 8/8] Update Makefile --- Source/HBIOS/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index e457bb7a..8f60c7e3 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -7,8 +7,8 @@ OBJECTS += MK4_std.rom OBJECTS += N8_std.rom OBJECTS += RCZ180_ext.rom OBJECTS += RCZ180_nat.rom -OBJECTS += RCZ80_kio.rom -OBJECTS += RCZ80_mt.rom +#OBJECTS += RCZ80_kio.rom +#OBJECTS += RCZ80_mt.rom #OBJECTS += RCZ80_std.rom #OBJECTS += RCZ80_wiz.rom #OBJECTS += SBC_simh.rom