From e72886cfaf09033fffc5c8fb1c0ebdab490f71c7 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Thu, 7 Jan 2021 14:32:58 -0800 Subject: [PATCH] Build Tweaks - Propagate build enhancements from Phil to Unix/Mac build. - Add removal of .upd files to Clean.cmd script in Binary directory. --- Binary/Clean.cmd | 1 + Source/HBIOS/Build.sh | 1 + Source/HBIOS/Makefile | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index 87c844e3..c00ca43e 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -6,6 +6,7 @@ if exist *.dat del *.dat if exist *.com del *.com if exist *.img del *.img if exist *.rom del *.rom +if exist *.upd del *.upd if exist *.pdf del *.pdf if exist *.eeprom del *.eeprom diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index 1ff9ab18..e63a9510 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -154,6 +154,7 @@ if [ $platform = UNA ] ; then cat ../UBIOS/UNA-BIOS.BIN osimg.bin ../UBIOS/FSFAT.BIN $romdiskfile >$romname.rom else cat hbios_rom.bin osimg.bin osimg1.bin osimg.bin $romdiskfile >$romname.rom + cat hbios_rom.bin osimg.bin osimg1.bin osimg.bin >$romname.upd cat hbios_app.bin osimg_small.bin > $romname.com # cat hbios_img.bin osimg_small.bin > $romname.img fi diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 20c273fe..6a45ea2c 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -5,27 +5,27 @@ endif ifdef ROM_PLATFORM OBJECTS = ${ROM_PLATFORM}_${ROM_CONFIG}.rom ${ROM_PLATFORM}_${ROM_CONFIG}.com else - OBJECTS += DYNO_std.rom DYNO_std.com - OBJECTS += EZZ80_std.rom EZZ80_std.com - OBJECTS += EZZ80_tz80.rom EZZ80_tz80.com - OBJECTS += MK4_std.rom MK4_std.com - OBJECTS += N8_std.rom N8_std.com - OBJECTS += RCZ180_ext.rom RCZ180_ext.com - OBJECTS += RCZ180_nat.rom RCZ180_nat.com - OBJECTS += RCZ280_ext.rom RCZ280_ext.com - OBJECTS += RCZ80_kio.rom RCZ80_kio.com - OBJECTS += RCZ80_mt.rom RCZ80_mt.com - OBJECTS += RCZ80_duart.rom RCZ80_duart.com - OBJECTS += RCZ80_std.rom RCZ80_std.com - OBJECTS += RCZ80_zrc.rom RCZ80_zrc.com - OBJECTS += SBC_simh.rom SBC_simh.com - OBJECTS += SBC_std.rom SBC_std.com - OBJECTS += SCZ180_126.rom SCZ180_126.com - OBJECTS += SCZ180_130.rom SCZ180_130.com - OBJECTS += SCZ180_131.rom SCZ180_131.com + OBJECTS += DYNO_std.rom DYNO_std.com DYNO_std.upd + OBJECTS += EZZ80_std.rom EZZ80_std.com EZZ80_std.upd + OBJECTS += EZZ80_tz80.rom EZZ80_tz80.com EZZ80_tz80.upd + OBJECTS += MK4_std.rom MK4_std.com MK4_std.upd + OBJECTS += N8_std.rom N8_std.com N8_std.upd + OBJECTS += RCZ180_ext.rom RCZ180_ext.com RCZ180_ext.upd + OBJECTS += RCZ180_nat.rom RCZ180_nat.com RCZ180_nat.upd + OBJECTS += RCZ280_ext.rom RCZ280_ext.com RCZ280_ext.upd + OBJECTS += RCZ80_kio.rom RCZ80_kio.com RCZ80_kio.upd + OBJECTS += RCZ80_mt.rom RCZ80_mt.com RCZ80_mt.upd + OBJECTS += RCZ80_duart.rom RCZ80_duart.com RCZ80_duart.upd + OBJECTS += RCZ80_std.rom RCZ80_std.com RCZ80_std.upd + OBJECTS += RCZ80_zrc.rom RCZ80_zrc.com RCZ80_zrc.upd + OBJECTS += SBC_simh.rom SBC_simh.com SBC_simh.upd + OBJECTS += SBC_std.rom SBC_std.com SBC_std.upd + OBJECTS += SCZ180_126.rom SCZ180_126.com SCZ180_126.upd + OBJECTS += SCZ180_130.rom SCZ180_130.com SCZ180_130.upd + OBJECTS += SCZ180_131.rom SCZ180_131.com SCZ180_131.upd OBJECTS += UNA_std.rom - OBJECTS += ZETA_std.rom ZETA_std.com - OBJECTS += ZETA2_std.rom ZETA2_std.com + OBJECTS += ZETA_std.rom ZETA_std.com ZETA_std.upd + OBJECTS += ZETA2_std.rom ZETA2_std.com ZETA2_std.upd endif MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \