From a40e7961a1068fbec828716fa60b5a22d495add4 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Tue, 3 Mar 2020 16:07:35 -0800
Subject: [PATCH] Build Process Updates

Minor udpates to build process to improve consistency between Windows and Mac/Linux builds.
---
 Source/HBIOS/Build.ps1 |  2 +-
 Source/HBIOS/Makefile  | 34 +++++++++++++++++-----------------
 Source/Images/Makefile |  3 ++-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Source/HBIOS/Build.ps1 b/Source/HBIOS/Build.ps1
index cc61b0b9..32f97ded 100644
--- a/Source/HBIOS/Build.ps1
+++ b/Source/HBIOS/Build.ps1
@@ -238,7 +238,7 @@ else
 {
 	Concat 'hbios_rom.bin','osimg.bin','osimg1.bin','osimg.bin',$RomDiskFile $RomFile
 	Concat 'hbios_app.bin','osimg.bin' $ComFile
-	Concat 'hbios_img.bin','osimg.bin' $ImgFile
+	# Concat 'hbios_img.bin','osimg.bin' $ImgFile
 }
 
 # Remove the temporary working ROM disk file
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index 3ca139f5..354dcd26 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -1,25 +1,25 @@
 OBJECTS =
 
 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 += DYNO_std.rom DYNO_std.com
+OBJECTS += EZZ80_std.rom EZZ80_std.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 += RCZ80_kio.rom RCZ80_kio.com
+OBJECTS += RCZ80_mt.rom RCZ80_mt.com
+OBJECTS += RCZ80_std.rom RCZ80_std.com
+OBJECTS += RCZ80_wiz.rom RCZ80_wiz.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 += UNA_std.rom
-OBJECTS += ZETA_std.rom
-OBJECTS += ZETA2_std.rom
+OBJECTS += ZETA_std.rom ZETA_std.com
+OBJECTS += ZETA2_std.rom ZETA2_std.com
 else
-OBJECTS += ZETA2_std.rom
+OBJECTS += ZETA2_std.rom ZETA2_std.com
 endif
 
 MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index b7953099..277ee494 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -6,7 +6,8 @@ SYSTEMS = ../CPM22/cpm_wbw.sys ../ZSDOS/zsys_wbw.sys ../CPM3/cpmldr.sys
 FDIMGS = fd_cpm22.img fd_zsdos.img fd_nzcom.img \
 	fd_cpm3.img fd_zpm3.img fd_ws4.img
 HDIMGS = hd_cpm22.img hd_zsdos.img hd_nzcom.img \
-	hd_cpm3.img hd_zpm3.img hd_ws4.img hd_bp.img
+	hd_cpm3.img hd_zpm3.img hd_ws4.img
+# HDIMGS += hd_bp.img
 
 OBJECTS = $(FDIMGS) $(HDIMGS) hd_combo.img
 OTHERS = blank144 blankhd