falso
/
zxuno-git
mirror of https://github.com/zxdos/zxuno.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from ivan-tat/master 

modflash: (fix) use `AddItem` tool from SDK
This commit is contained in:
Ivan Tatarinov 2021-04-14 17:10:30 +03:00 committed by GitHub
parent acd9a9652a cf9828d0ae
commit f9513d43ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modflash/Makefile
View File

@ -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

3
modflash/addcores.sh
View File

@ -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
}

3
modflash/addroms.sh
View File

@ -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
}