diff --git a/Source/Apps/FAT/Makefile b/Source/Apps/FAT/Makefile index 51bf7f98..245385f2 100644 --- a/Source/Apps/FAT/Makefile +++ b/Source/Apps/FAT/Makefile @@ -1,5 +1,5 @@ -OBJECTS = FAT.COM -NODELETE = FAT.COM +OBJECTS = FAT.com +NODELETE = FAT.com DEST = ../../../Binary/Apps TOOLS=../../../Tools diff --git a/Source/Apps/FDU/Makefile b/Source/Apps/FDU/Makefile index a7c26e7c..ade7444a 100644 --- a/Source/Apps/FDU/Makefile +++ b/Source/Apps/FDU/Makefile @@ -1,10 +1,8 @@ -OBJECTS = FDU.COM -DOCS = FDU.TXT +OBJECTS = FDU.com +DOCS = FDU.txt DEST = ../../../Binary/Apps DOCDEST = ../../../Doc TOOLS = ../../../Tools include $(TOOLS)/Makefile.inc -%.COM: %.asm - $(TASM) $< $@ - +%.com: USETASM=1 diff --git a/Source/Apps/XM/Build.cmd b/Source/Apps/XM/Build.cmd index a11742eb..4fbbae00 100644 --- a/Source/Apps/XM/Build.cmd +++ b/Source/Apps/XM/Build.cmd @@ -11,12 +11,12 @@ set ZXINCDIR=%TOOLS%\cpm\include\ zx mac xmdm125.asm $PO zx slr180 -xmhb/HF -zx slr180 -xmuf/HF +rem zx slr180 -xmuf/HF zx mload25 XM=xmdm125,xmhb -zx mload25 XMUF=xmdm125,xmuf +rem zx mload25 XMUF=xmdm125,xmuf rem set PROMPT=[Build] %PROMPT% rem %comspec% copy /Y XM.com ..\..\..\Binary\Apps\ -copy /Y XMUF.com ..\..\..\Binary\Apps\ +rem copy /Y XMUF.com ..\..\..\Binary\Apps\ diff --git a/Source/Apps/XM/Makefile b/Source/Apps/XM/Makefile index 72aed531..b16ff7ef 100644 --- a/Source/Apps/XM/Makefile +++ b/Source/Apps/XM/Makefile @@ -1,4 +1,5 @@ -OBJECTS = xm.com xmuf.com +#OBJECTS = xm.com xmuf.com +OBJECTS = xm.com DEST = ../../../Binary/Apps TOOLS = ../../../Tools OTHERS = *.hex @@ -8,5 +9,5 @@ include $(TOOLS)/Makefile.inc xm.com: xmdm125.hex xmhb.hex $(ZXCC) $(CPM)/MLOAD25 XM=xmdm125,xmhb -xmuf.com: xmdm125.hex xmuf.hex - $(ZXCC) $(CPM)/MLOAD25 XMUF=xmdm125,xmuf +#xmuf.com: xmdm125.hex xmuf.hex +# $(ZXCC) $(CPM)/MLOAD25 XMUF=xmdm125,xmuf diff --git a/Source/Images/Build.cmd b/Source/Images/Build.cmd index ac05ba65..2305cc74 100644 --- a/Source/Images/Build.cmd +++ b/Source/Images/Build.cmd @@ -1,14 +1,9 @@ @echo off setlocal -echo : -echo : Cleaning... -echo : -call Clean.cmd - -echo : -echo : Building Floppy Disk Images... -echo : +echo. +echo Building Floppy Disk Images... +echo. call BuildFD.cmd cpm22 ..\cpm22\cpm_wbw.sys call BuildFD.cmd zsdos ..\zsdos\zsys_wbw.sys call BuildFD.cmd nzcom ..\zsdos\zsys_wbw.sys @@ -16,9 +11,9 @@ call BuildFD.cmd cpm3 ..\cpm3\cpmldr.sys call BuildFD.cmd zpm3 ..\cpm3\cpmldr.sys call BuildFD.cmd ws4 -echo : -echo : Building Hard Disk Images... -echo : +echo. +echo Building Hard Disk Images... +echo. call BuildHD.cmd cpm22 ..\cpm22\cpm_wbw.sys call BuildHD.cmd zsdos ..\zsdos\zsys_wbw.sys call BuildHD.cmd nzcom ..\zsdos\zsys_wbw.sys @@ -28,4 +23,6 @@ call BuildHD.cmd ws4 if exist ..\BPBIOS\bpbio-ww.rel call BuildHD.cmd bp +echo. +echo Building Combo Disk Image... copy /b ..\..\Binary\hd_cpm22.img + ..\..\Binary\hd_zsdos.img + ..\..\Binary\hd_nzcom.img + ..\..\Binary\hd_cpm3.img + ..\..\Binary\hd_zpm3.img + ..\..\Binary\hd_ws4.img ..\..\Binary\hd_combo.img diff --git a/Source/Images/d_cpm22/u0/CLRDIR.COM b/Source/Images/Common/CLRDIR.COM similarity index 100% rename from Source/Images/d_cpm22/u0/CLRDIR.COM rename to Source/Images/Common/CLRDIR.COM diff --git a/Source/Images/d_cpm22/u0/COMPARE.COM b/Source/Images/Common/COMPARE.COM similarity index 100% rename from Source/Images/d_cpm22/u0/COMPARE.COM rename to Source/Images/Common/COMPARE.COM diff --git a/Source/Images/d_cpm22/u0/DDTZ.COM b/Source/Images/Common/DDTZ.COM similarity index 100% rename from Source/Images/d_cpm22/u0/DDTZ.COM rename to Source/Images/Common/DDTZ.COM diff --git a/Source/Images/d_cpm22/u0/FDISK80.COM b/Source/Images/Common/FDISK80.COM similarity index 100% rename from Source/Images/d_cpm22/u0/FDISK80.COM rename to Source/Images/Common/FDISK80.COM diff --git a/Source/Images/d_cpm22/u0/FLASH.COM b/Source/Images/Common/FLASH.COM similarity index 100% rename from Source/Images/d_cpm22/u0/FLASH.COM rename to Source/Images/Common/FLASH.COM diff --git a/Source/Images/d_cpm22/u0/NULU.COM b/Source/Images/Common/NULU.COM similarity index 100% rename from Source/Images/d_cpm22/u0/NULU.COM rename to Source/Images/Common/NULU.COM diff --git a/Source/Images/d_cpm22/u0/UNARC.COM b/Source/Images/Common/UNARC.COM similarity index 100% rename from Source/Images/d_cpm22/u0/UNARC.COM rename to Source/Images/Common/UNARC.COM diff --git a/Source/Images/d_cpm22/u0/ZAP.COM b/Source/Images/Common/ZAP.COM similarity index 100% rename from Source/Images/d_cpm22/u0/ZAP.COM rename to Source/Images/Common/ZAP.COM diff --git a/Source/Images/d_cpm22/u0/ZDE.COM b/Source/Images/Common/ZDE.COM similarity index 100% rename from Source/Images/d_cpm22/u0/ZDE.COM rename to Source/Images/Common/ZDE.COM diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt index 331a4b24..b075ca86 100644 --- a/Source/Images/d_bp.txt +++ b/Source/Images/d_bp.txt @@ -1,24 +1,10 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: +../../Binary/Apps/*.com 15: # -# Add Tune application and sample files +# Add Tune sample files # -../../Binary/Apps/tune.com 3: ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: # diff --git a/Source/Images/d_cpm22.txt b/Source/Images/d_cpm22.txt index 45e9990a..49f112c3 100644 --- a/Source/Images/d_cpm22.txt +++ b/Source/Images/d_cpm22.txt @@ -1,27 +1,17 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: -# -# Add Tune application and sample files -# -../../Binary/Apps/tune.com 3: +../../Binary/Apps/*.com 0: +# +# Add Tune sample files +# ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: # # Add OS image # ../CPM22/cpm_wbw.sys 0:cpm.sys +# +# Add Common Applications +# +Common/*.* 0: diff --git a/Source/Images/d_cpm3.txt b/Source/Images/d_cpm3.txt index 4e7f63cc..3ac5e227 100644 --- a/Source/Images/d_cpm3.txt +++ b/Source/Images/d_cpm3.txt @@ -21,23 +21,13 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: -# -# Add Tune application and sample files -# -../../Binary/Apps/tune.com 3: +../../Binary/Apps/*.com 0: +# +# Add Tune sample files +# ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: +# +# Add Common Applications +# +Common/*.* 0: diff --git a/Source/Images/d_nzcom.txt b/Source/Images/d_nzcom.txt index b5c98944..cb131317 100644 --- a/Source/Images/d_nzcom.txt +++ b/Source/Images/d_nzcom.txt @@ -1,28 +1,18 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: -# -# Add Tune application and sample files -# -../../Binary/Apps/tune.com 3: +../../Binary/Apps/*.com 0: +# +# Add Tune sample files +# ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: # # Add OS images # ../CPM22/cpm_wbw.sys 0:cpm.sys -../ZSDOS/zsys_wbw.sys 0:zsys.sys \ No newline at end of file +../ZSDOS/zsys_wbw.sys 0:zsys.sys +# +# Add Common Applications +# +Common/*.* 0: diff --git a/Source/Images/d_zpm3.txt b/Source/Images/d_zpm3.txt index 44b67b06..c330d32c 100644 --- a/Source/Images/d_zpm3.txt +++ b/Source/Images/d_zpm3.txt @@ -1,13 +1,13 @@ # -# Add files from CPM3 build +# Add files from ZPM3 build # ../ZPM3/zpmldr.com 0: ../ZPM3/zpmldr.sys 0: ../CPM3/cpmldr.com 0: ../CPM3/cpmldr.sys 0: -../ZPM3/autotog.com 0: -../ZPM3/clrhist.com 0: -../ZPM3/setz3.com 0: +../ZPM3/autotog.com 15: +../ZPM3/clrhist.com 15: +../ZPM3/setz3.com 15: ../ZPM3/cpm3.sys 0: ../ZPM3/zccp.com 0: ../ZPM3/zinstal.zpm 0: @@ -20,23 +20,13 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: -# -# Add Tune application and sample files -# -../../Binary/Apps/tune.com 3: +../../Binary/Apps/*.com 15: +# +# Add Tune sample files +# ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: +# +# Add Common Applications +# +Common/*.* 15: diff --git a/Source/Images/d_zpm3/u15/autotog.com b/Source/Images/d_zpm3/u15/autotog.com deleted file mode 100644 index 3c7a5980..00000000 Binary files a/Source/Images/d_zpm3/u15/autotog.com and /dev/null differ diff --git a/Source/Images/d_zpm3/u15/clrhist.com b/Source/Images/d_zpm3/u15/clrhist.com deleted file mode 100644 index 02a39c83..00000000 Binary files a/Source/Images/d_zpm3/u15/clrhist.com and /dev/null differ diff --git a/Source/Images/d_zpm3/u15/nulu.com b/Source/Images/d_zpm3/u15/nulu.com deleted file mode 100644 index fc5594b1..00000000 Binary files a/Source/Images/d_zpm3/u15/nulu.com and /dev/null differ diff --git a/Source/Images/d_zpm3/u15/setz3.com b/Source/Images/d_zpm3/u15/setz3.com deleted file mode 100644 index 4ddb374f..00000000 Binary files a/Source/Images/d_zpm3/u15/setz3.com and /dev/null differ diff --git a/Source/Images/d_zpm3/u15/zde.com b/Source/Images/d_zpm3/u15/zde.com deleted file mode 100644 index 9bc493c3..00000000 Binary files a/Source/Images/d_zpm3/u15/zde.com and /dev/null differ diff --git a/Source/Images/d_zsdos.txt b/Source/Images/d_zsdos.txt index 2e9fe5ad..c9e552a1 100644 --- a/Source/Images/d_zsdos.txt +++ b/Source/Images/d_zsdos.txt @@ -1,27 +1,17 @@ # # Add RomWBW utilities # -../../Binary/Apps/assign.com 0: -../../Binary/Apps/fat.com 0: -../../Binary/Apps/fdu.com 0: -../../Binary/Apps/format.com 0: -../../Binary/Apps/mode.com 0: -../../Binary/Apps/osldr.com 0: -../../Binary/Apps/rtc.com 0: -../../Binary/Apps/survey.com 0: -../../Binary/Apps/syscopy.com 0: -../../Binary/Apps/sysgen.com 0: -../../Binary/Apps/talk.com 0: -../../Binary/Apps/timer.com 0: -../../Binary/Apps/xm.com 0: -../../Binary/Apps/inttest.com 0: -# -# Add Tune application and sample files -# -../../Binary/Apps/tune.com 3: +../../Binary/Apps/*.com 0: +# +# Add Tune sample files +# ../../Binary/Apps/Tunes/*.pt? 3: ../../Binary/Apps/Tunes/*.mym 3: # # Add OS image # -../ZSDOS/zsys_wbw.sys 0:zsys.sys \ No newline at end of file +../ZSDOS/zsys_wbw.sys 0:zsys.sys +# +# Add Common Applications +# +Common/*.* 0: diff --git a/Source/Images/d_zsdos/u0/CLRDIR.COM b/Source/Images/d_zsdos/u0/CLRDIR.COM deleted file mode 100644 index d1f2a7d6..00000000 Binary files a/Source/Images/d_zsdos/u0/CLRDIR.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/COMPARE.COM b/Source/Images/d_zsdos/u0/COMPARE.COM deleted file mode 100644 index 29fa41e6..00000000 Binary files a/Source/Images/d_zsdos/u0/COMPARE.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/DDTZ.COM b/Source/Images/d_zsdos/u0/DDTZ.COM deleted file mode 100644 index 4f6eca6b..00000000 Binary files a/Source/Images/d_zsdos/u0/DDTZ.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/FDISK80.COM b/Source/Images/d_zsdos/u0/FDISK80.COM deleted file mode 100644 index 00ac10f7..00000000 Binary files a/Source/Images/d_zsdos/u0/FDISK80.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/FLASH.COM b/Source/Images/d_zsdos/u0/FLASH.COM deleted file mode 100644 index 1b7fa64c..00000000 Binary files a/Source/Images/d_zsdos/u0/FLASH.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/NULU.COM b/Source/Images/d_zsdos/u0/NULU.COM deleted file mode 100644 index fc5594b1..00000000 Binary files a/Source/Images/d_zsdos/u0/NULU.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/UNARC.COM b/Source/Images/d_zsdos/u0/UNARC.COM deleted file mode 100644 index 8cc90746..00000000 Binary files a/Source/Images/d_zsdos/u0/UNARC.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/ZAP.COM b/Source/Images/d_zsdos/u0/ZAP.COM deleted file mode 100644 index 47ffcbb8..00000000 Binary files a/Source/Images/d_zsdos/u0/ZAP.COM and /dev/null differ diff --git a/Source/Images/d_zsdos/u0/ZDE.COM b/Source/Images/d_zsdos/u0/ZDE.COM deleted file mode 100644 index 9bc493c3..00000000 Binary files a/Source/Images/d_zsdos/u0/ZDE.COM and /dev/null differ