From 6ad45ab0def6e5a4a2b56c6074b546bad962ec11 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Thu, 14 Oct 2021 12:45:34 -0700 Subject: [PATCH] ZMD Build Fix - Trying to get past MLOAD25 in ZMD build on GitHub. Updated ZX syntax to include a hyphen before the options. --- Source/Apps/Makefile | 3 +-- Source/Apps/ZMD/Build.cmd | 2 +- Source/Apps/ZMD/Makefile | 2 +- Source/Images/d_bp.txt | 2 +- Source/Images/d_cpm22.txt | 2 +- Source/Images/d_cpm3.txt | 2 +- Source/Images/d_nzcom.txt | 2 +- Source/Images/d_zpm3.txt | 2 +- Source/Images/d_zsdos.txt | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile index 925621d2..ea2decb0 100644 --- a/Source/Apps/Makefile +++ b/Source/Apps/Makefile @@ -1,8 +1,7 @@ OBJECTS = sysgen.com survey.com \ syscopy.com assign.com format.com talk.com mode.com rtc.com \ timer.com rtchb.com -#SUBDIRS = XM FDU FAT Tune Test ZMP ZMD -SUBDIRS = XM FDU FAT Tune Test ZMP +SUBDIRS = XM FDU FAT Tune Test ZMP ZMD DEST = ../../Binary/Apps TOOLS =../../Tools diff --git a/Source/Apps/ZMD/Build.cmd b/Source/Apps/ZMD/Build.cmd index fdc64135..cc8d63d5 100644 --- a/Source/Apps/ZMD/Build.cmd +++ b/Source/Apps/ZMD/Build.cmd @@ -31,7 +31,7 @@ zx z80asm -zmdel/fm zx l80 -zmdel,zmdel/n/e zx z80asm -zmdhb/fh -zx mload25 zmd=zmd.com,zmdhb +zx mload25 -zmd=zmd.com,zmdhb copy /Y zmd.com ..\..\..\Binary\Apps\ || exit /b diff --git a/Source/Apps/ZMD/Makefile b/Source/Apps/ZMD/Makefile index 4ec3206f..997b4997 100644 --- a/Source/Apps/ZMD/Makefile +++ b/Source/Apps/ZMD/Makefile @@ -7,4 +7,4 @@ include $(TOOLS)/Makefile.inc zmd.com: zmd.rel zmdhb.hex $(ZXCC) $(CPM)/L80 -zmd,zmd/n/e - $(ZXCC) $(CPM)/MLOAD25 zmd=zmd.com,zmdhb + $(ZXCC) $(CPM)/MLOAD25 -zmd=zmd.com,zmdhb diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt index 6e0ca6bd..e6ce4a2b 100644 --- a/Source/Images/d_bp.txt +++ b/Source/Images/d_bp.txt @@ -31,7 +31,7 @@ ../../Binary/Apps/zmterm.ovr 15: ../../Binary/Apps/zminit.ovr 15: ../../Binary/Apps/zmconfig.ovr 15: -#../../Binary/Apps/zmd.com 15: +../../Binary/Apps/zmd.com 15: # #../../Binary/Apps/i2clcd.com 2: diff --git a/Source/Images/d_cpm22.txt b/Source/Images/d_cpm22.txt index 32806365..8e4245a9 100644 --- a/Source/Images/d_cpm22.txt +++ b/Source/Images/d_cpm22.txt @@ -27,7 +27,7 @@ d_cpm22/ReadMe.txt 0: ../../Binary/Apps/zmterm.ovr 0: ../../Binary/Apps/zminit.ovr 0: ../../Binary/Apps/zmconfig.ovr 0: -#../../Binary/Apps/zmd.com 0: +../../Binary/Apps/zmd.com 0: # #../../Binary/Apps/i2clcd.com 2: #../../Binary/Apps/i2cscan.com 2: diff --git a/Source/Images/d_cpm3.txt b/Source/Images/d_cpm3.txt index eed2837a..036adcf8 100644 --- a/Source/Images/d_cpm3.txt +++ b/Source/Images/d_cpm3.txt @@ -43,7 +43,7 @@ ../../Binary/Apps/zmterm.ovr 0: ../../Binary/Apps/zminit.ovr 0: ../../Binary/Apps/zmconfig.ovr 0: -#../../Binary/Apps/zmd.com 0: +../../Binary/Apps/zmd.com 0: # #../../Binary/Apps/i2clcd.com 2: #../../Binary/Apps/i2cscan.com 2: diff --git a/Source/Images/d_nzcom.txt b/Source/Images/d_nzcom.txt index 8be1c1dc..e9cc1e3f 100644 --- a/Source/Images/d_nzcom.txt +++ b/Source/Images/d_nzcom.txt @@ -44,7 +44,7 @@ d_zsdos/u0/*.* 0: ../../Binary/Apps/zmterm.ovr 0: ../../Binary/Apps/zminit.ovr 0: ../../Binary/Apps/zmconfig.ovr 0: -#../../Binary/Apps/zmd.com 0: +../../Binary/Apps/zmd.com 0: # #../../Binary/Apps/i2clcd.com 2: #../../Binary/Apps/i2cscan.com 2: diff --git a/Source/Images/d_zpm3.txt b/Source/Images/d_zpm3.txt index 5311b5ef..8bf0ce43 100644 --- a/Source/Images/d_zpm3.txt +++ b/Source/Images/d_zpm3.txt @@ -42,7 +42,7 @@ ../../Binary/Apps/zmterm.ovr 15: ../../Binary/Apps/zminit.ovr 15: ../../Binary/Apps/zmconfig.ovr 15: -#../../Binary/Apps/zmd.com 15: +../../Binary/Apps/zmd.com 15: # #../../Binary/Apps/i2clcd.com 2: #../../Binary/Apps/i2cscan.com 2: diff --git a/Source/Images/d_zsdos.txt b/Source/Images/d_zsdos.txt index c9b56b75..a691c5df 100644 --- a/Source/Images/d_zsdos.txt +++ b/Source/Images/d_zsdos.txt @@ -40,7 +40,7 @@ d_cpm22/u0/XSUB.COM 0: ../../Binary/Apps/zmterm.ovr 0: ../../Binary/Apps/zminit.ovr 0: ../../Binary/Apps/zmconfig.ovr 0: -#../../Binary/Apps/zmd.com 0: +../../Binary/Apps/zmd.com 0: # #../../Binary/Apps/i2clcd.com 2: #../../Binary/Apps/i2cscan.com 2: