diff --git a/Binary/Apps/Makefile b/Binary/Apps/Makefile index 3fc3e53d..ea259d94 100644 --- a/Binary/Apps/Makefile +++ b/Binary/Apps/Makefile @@ -1,5 +1,5 @@ TOOLS = ../../Tools -MOREDIFF := *.com *.COM Tunes/* +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com Tunes/*) include $(TOOLS)/Makefile.inc diff --git a/Binary/Makefile b/Binary/Makefile index 6c4ebecd..c856d1b8 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,5 +1,5 @@ -MOREDIFF := *.img *.rom *.com *.eeprom TOOLS = ../Tools +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom) SUBDIRS = Apps include $(TOOLS)/Makefile.inc diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index ed7dadde..17fa3679 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -48,7 +48,7 @@ Apps=(assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm intte timestamp=$(date +%Y-%m-%d) timestamp="2020-02-20" -blankfile=Blank${romsize}.dat +blankfile=Blank${romsize}KB.dat romdiskfile=RomDisk.tmp romfmt=wbw_rom${romsize} outdir=../../Binary diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index f5a36a41..6bdff696 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,4 +1,4 @@ -OBJECTS = ZETA2_std.rom N8_std.rom SBC_std.rom +OBJECTS = ZETA2_std.rom # N8_std.rom SBC_std.rom MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \ eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \ diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc index 5d5062fc..db6b2b1b 100644 --- a/Tools/Makefile.inc +++ b/Tools/Makefile.inc @@ -148,19 +148,21 @@ ifneq ($(DIFFTO),) @for i in $(OBJECTS) $(MOREDIFF) ; do \ sf=$$($(CASEFN) $$i) ; \ df=$$($(CASEFN) $(DIFFPATH)/$$i) ; \ - if [ -f $$df -a -f $$sf ] ; then \ + if [ -f "$$df" -a -f "$$sf" ] ; then \ if [ "$(VERBOSEDIFF)" ] ; then \ echo compare $$sf and $$df ; \ fi ; \ if ! cmp -s $$sf $$df ; then \ echo " " $$sf and $$df differ ; \ if [ "$(VERBOSEDIFF)" = "2" ] ; then \ - cmp -bl $$sf $$df ; \ hexdump -Cv $$sf > $$sf.dump ; \ hexdump -Cv $$df > $$(basename $$df).dump.diff ; \ fi \ fi \ - fi \ + else \ + if [ ! -f "$$sf" ] ; then echo $$i missing ; fi ; \ + if [ ! -f "$$df" ] ; then echo $(DIFFPATH)/$$i missing ; fi ; \ + fi ; \ done endif