From 12d1ce4000ed6d6f23322971e1fd973bae43093e Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Thu, 25 Feb 2021 14:37:33 -0800
Subject: [PATCH] Build Process Tweaks

---
 Source/Build.cmd     |  3 ++-
 Source/ZRC/Build.cmd | 11 ++---------
 Source/ZRC/Makefile  | 10 ++++++++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Source/Build.cmd b/Source/Build.cmd
index 9419b3ce..b3322ee9 100644
--- a/Source/Build.cmd
+++ b/Source/Build.cmd
@@ -6,4 +6,5 @@ setlocal & call BuildProp || exit /b 1 & endlocal
 setlocal & call BuildShared || exit /b 1 & endlocal
 REM setlocal & call BuildBP || exit /b 1 & endlocal
 setlocal & call BuildImages || exit /b 1 & endlocal
-setlocal & call BuildROM %* || exit /b 1 & endlocal
\ No newline at end of file
+setlocal & call BuildROM %* || exit /b 1 & endlocal
+setlocal & call BuildZRC %* || exit /b 1 & endlocal
\ No newline at end of file
diff --git a/Source/ZRC/Build.cmd b/Source/ZRC/Build.cmd
index 878de718..5286a107 100644
--- a/Source/ZRC/Build.cmd
+++ b/Source/ZRC/Build.cmd
@@ -1,15 +1,8 @@
 @echo off
 setlocal
 
-if not exist ..\..\Binary\RCZ80_zrc.rom goto :err
+if not exist ..\..\Binary\RCZ80_zrc.rom goto :eof
 
 copy /b zrc_cfldr.bin + zrc_ptbl.bin + zrc_fill_1.bin + zrc_mon.bin + zrc_fill_2.bin + ..\..\Binary\RCZ80_zrc.rom + zrc_fill_3.bin ..\..\Binary\hd1024_zrc_prefix.dat
 
-copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img
-
-goto :eof
-
-:err
-
-echo *** Can't build ZRC prefix file -- missing "..\..\Binary\RCZ80_zrc.rom"
-exit /b 1
\ No newline at end of file
+copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img
\ No newline at end of file
diff --git a/Source/ZRC/Makefile b/Source/ZRC/Makefile
index aed2c80b..3c582211 100644
--- a/Source/ZRC/Makefile
+++ b/Source/ZRC/Makefile
@@ -1,10 +1,13 @@
 HD1024ZRCPREFIX = hd1024_zrc_prefix.dat
+HD1024ZRCCOMBOIMG = hd1024_zrc_combo.img
 ZRCROM = ../../Binary/RCZ80_zrc.rom
+HD1024IMGS = ../../Binary/hd1024_cpm22.img ../../Binary/hd1024_zsdos.img ../../Binary/hd1024_nzcom.img \
+	../../Binary/hd1024_cpm3.img ../../Binary/hd1024_zpm3.img ../../Binary/hd1024_ws4.img
 
 OBJECTS :=
 
 ifneq ($(wildcard $(ZRCROM)),)
-	OBJECTS += $(HD1024ZRCPREFIX)
+	OBJECTS += $(HD1024ZRCPREFIX) $(HD1024ZRCCOMBOIMG)
 endif
 
 DEST=../../Binary
@@ -16,4 +19,7 @@ include $(TOOLS)/Makefile.inc
 DIFFPATH = $(DIFFTO)/Binary
 
 $(HD1024ZRCPREFIX):
-	cat zrc_cfldr.bin zrc_ptbl.bin zrc_fill_1.bin zrc_mon.bin zrc_fill_2.bin $(ZRCROM) zrc_fill_3.bin >$@
\ No newline at end of file
+	cat zrc_cfldr.bin zrc_ptbl.bin zrc_fill_1.bin zrc_mon.bin zrc_fill_2.bin $(ZRCROM) zrc_fill_3.bin >$@
+
+$(HD1024ZRCCOMBOIMG): $(HD1024ZRCPREFIX) $(HD1024IMGS)
+	cat $^ > $@
\ No newline at end of file