diff --git a/modflash/Makefile b/modflash/Makefile index d55ccc8..bc758ff 100644 --- a/modflash/Makefile +++ b/modflash/Makefile @@ -8,30 +8,14 @@ include ../sdk/common.mk -ifeq ($(OS),Windows_NT) -ADDITEM = AddItem.exe -else -ADDITEM = AddItem -endif - .PHONY: all all: | FLASHempty.ZX1 $(ADDITEM) ./addroms.sh ./addcores.sh roms.txt cores.txt cp FLASHempty.ZX1 FLASH.ZX1 ./addroms.sh ./addcores.sh -ifneq ($(OS),Windows_NT) -$(ADDITEM): AddItem.c - $(CC) $(CFLAGS) $< -o $@ -endif - .PHONY: clean -clean: -ifeq ($(OS),Windows_NT) - # Nothing to do -else - rm -f $(ADDITEM) -endif +clean:; .PHONY: dist-clean dist-clean: clean diff --git a/modflash/addcores.sh b/modflash/addcores.sh index 145d40c..c498228 100755 --- a/modflash/addcores.sh +++ b/modflash/addcores.sh @@ -5,7 +5,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -ADDITEM=./AddItem i=2 Error() { @@ -17,7 +16,7 @@ AddCore() { local f=${3%.*}.tap echo "Adding core $i: \"$2\" ($3)..." GenRom $1 "$2" $3 $f || Error $? - $ADDITEM CORE$i $f || Error $? + AddItem CORE$i $f || Error $? rm -f $f let i+=1 } diff --git a/modflash/addroms.sh b/modflash/addroms.sh index 76d052b..004e553 100755 --- a/modflash/addroms.sh +++ b/modflash/addroms.sh @@ -5,7 +5,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -ADDITEM=./AddItem i=0 Error() { @@ -19,7 +18,7 @@ AddROM() { local f=${3%.*}.tap echo "Adding ROM in slots $i-$i1: \"$2\" ($3)..." GenRom $1 "$2" $3 $f || Error $? - $ADDITEM ROM $i $f || Error $? + AddItem ROM $i $f || Error $? rm -f $f let i=i1+1 }