Fix More Build Anomalies

Source/ZPM3/Build.cmd

@@ -43,6 +43,11 @@ copy genbnk.dat gencpm.dat
 zx gencpm -auto -display
 rem pause
 
+rem ZPM3 Tools
+zx Z80ASM -clrhist/F
+zx Z80ASM -setz3/F
+zx Z80ASM -autotog/F
+
 rem Loader
 
 tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst

Source/ZPM3/Clean.cmd

@@ -16,6 +16,9 @@ if exist zpmldr.com del zpmldr.com
 if exist cpmldr.com del cpmldr.com
 if exist startzpm.com del startzpm.com
 if exist gencpm.com del gencpm.com
+if exist clrhist.com del clrhist.com
+if exist setz3.com del setz3.com
+if exist autotog.com del autotog.com
 if exist *.dat del *.dat
 if exist biosldr?.rel del biosldr?.rel
 if exist *.bin del *.bin

Source/ZPM3/Makefile

@@ -1,9 +1,6 @@
 OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com
-#ifdef REBUILD_ZPM_TOOLS
+NODELETE = makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
 OBJECTS += setz3.com clrhist.com autotog.com
-#else
-NODELETE = setz3.com clrhist.com autotog.com makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
-#endif
 OBJECTS += cpmldr.com cpmldr.sys zinstal.zpm makedos.com gencpm.dat bnkbios3.spr bnkbdos3.spr resbdos3.spr
 OTHERS = zpmldr.bin loader.bin biosldrd.rel biosldrc.rel util.rel gencpm.com
 DEST = ../../Binary/ZPM3/
@@ -53,7 +50,9 @@ startzpm.com: ../ZCCP/startzpm.com
 	cp $< $@
 
 cpmldr.com: ../CPM3/cpmldr.com
+	rm -f /tmp/casefn.cache
 	cp $< $@
 
 cpmldr.sys: ../CPM3/cpmldr.sys
+	rm -f /tmp/casefn.cache
 	cp $< $@

Tools/Makefile.inc

@@ -66,6 +66,7 @@ CPM=$(TOOLS)/cpm/bin
 
 %.com: %.z80
 	$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/F ; \
+	rm -f /tmp/casefn.cache ; \
 	mv $$($(CASEFN) $@) tmp.com ; mv tmp.com $@
 
 %.bin: %.asm