Misc. Cleanup

Includes some minor improvements to contents in some disk images.

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

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

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\

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

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

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:
 #

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:
+../../Binary/Apps/*.com 0:
 #
-# 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:
 #
 # Add OS image
 #
 ../CPM22/cpm_wbw.sys 0:cpm.sys
+#
+# Add Common Applications
+#
+Common/*.* 0:

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:
+../../Binary/Apps/*.com 0:
 #
-# 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:
+#
+# Add Common Applications
+#
+Common/*.* 0:

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:
+../../Binary/Apps/*.com 0:
 #
-# 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:
 #
 # Add OS images
 #
 ../CPM22/cpm_wbw.sys 0:cpm.sys
-../ZSDOS/zsys_wbw.sys 0:zsys.sys
+../ZSDOS/zsys_wbw.sys 0:zsys.sys
+#
+# Add Common Applications
+#
+Common/*.* 0:

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:
+../../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:
+#
+# Add Common Applications
+#
+Common/*.* 15:

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:
+../../Binary/Apps/*.com 0:
 #
-# 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:
 #
 # Add OS image
 #
-../ZSDOS/zsys_wbw.sys 0:zsys.sys
+../ZSDOS/zsys_wbw.sys 0:zsys.sys
+#
+# Add Common Applications
+#
+Common/*.* 0: