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 #86 from ivan-tat/master 

sdk/include: moved `Print.inc`, `rdflsh.inc`, `rst28.inc`, `wrflsh.inc` from `utils`
This commit is contained in:
Ivan Tatarinov 2021-05-17 12:02:54 +03:00 committed by GitHub
parent 031134a3a5 5a54e33e9e
commit ac09afbc57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 176 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Makefile
View File

@ -15,30 +15,19 @@
include sdk/common.mk include sdk/common.mk
INSTALL_DIR=SD # Use uppercase for FAT filesystem
prefix ?= SD
exec_prefix ?= $(prefix)
bindir ?= $(exec_prefix)/BIN
UTILS_TARGETS=\ INSTALL ?= install
BACK16M\ INSTALL_PROGRAM ?= $(INSTALL)
BACKZX2\ RM = rm -f
BACKZXD\
BACKUP\
CORCLEAN\
COREBIOS\
ROMSBACK\
ROMSUPGR\
UPGR16M\
UPGRZX2\
UPGRZXD\
UPGRADE
UTILS_INSTALL_DIR=$(INSTALL_DIR)/BIN
SOFTWARE_TARGETS=\ SOFTWARE_TARGETS=\
ESPRST\ ESPRST\
IWCONFIG IWCONFIG
SOFTWARE_INSTALL_DIR=$(INSTALL_DIR)/BIN
.PHONY: all .PHONY: all
all:\ all:\
install-utils\ install-utils\
@ -48,36 +37,27 @@ all:\
# utils # utils
.PHONY: install-utils .PHONY: install-utils
install-utils: $(foreach t,$(UTILS_TARGETS),$(UTILS_INSTALL_DIR)/$(t)) | utils install-utils: | utils
$(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) install
# $1 = target
define utils_rule =
$$(UTILS_INSTALL_DIR)/$1: utils/build/$1 | utils
mv $$< $$@
utils/build/$1: | utils
$$(MAKE) -w -C $$| build/$$(@F)
endef
$(foreach t,$(UTILS_TARGETS),$(eval $(call utils_rule,$(t))))
.PHONY: clean-utils .PHONY: clean-utils
clean-utils: | utils clean-utils: | utils
$(MAKE) -w -C $| clean $(MAKE) -w -C $| clean
.PHONY: uninstall-utils .PHONY: uninstall-utils
uninstall-utils: clean-utils uninstall-utils: clean-utils | utils
rm -f $(foreach t,$(UTILS_TARGETS),$(UTILS_INSTALL_DIR)/$(t)) $(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) uninstall
# software # software
.PHONY: install-software .PHONY: install-software
install-software: $(foreach t,$(SOFTWARE_TARGETS),$(SOFTWARE_INSTALL_DIR)/$(t)) install-software: $(foreach t,$(SOFTWARE_TARGETS),$(DESTDIR)$(bindir)/$(t))
$(SOFTWARE_INSTALL_DIR)/ESPRST: software/esprst/esprst $(DESTDIR)$(bindir)/ESPRST: software/esprst/esprst
mv $< $@ $(INSTALL) $< $@
$(SOFTWARE_INSTALL_DIR)/IWCONFIG: software/iwconfig/IWCONFIG $(DESTDIR)$(bindir)/IWCONFIG: software/iwconfig/IWCONFIG
mv $< $@ $(INSTALL) $< $@
software/esprst/esprst: | software/esprst software/esprst/esprst: | software/esprst
$(MAKE) -w -C $| $(MAKE) -w -C $|
@ -94,7 +74,7 @@ clean-software: |\
.PHONY: uninstall-software .PHONY: uninstall-software
uninstall-software: clean-software uninstall-software: clean-software
rm -f $(foreach t,$(SOFTWARE_TARGETS),$(SOFTWARE_INSTALL_DIR)/$(t)) $(RM) $(foreach t,$(SOFTWARE_TARGETS),$(DESTDIR)$(bindir)/$(t))
# clean # clean

10
sdk/LICENSES/Unlicense.txt Normal file
View File

@ -0,0 +1,10 @@
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>

0
utils/Print.inc → sdk/include/Print.inc
View File

0
utils/rdflsh.inc → sdk/include/rdflsh.inc
View File

0
utils/rst28.inc → sdk/include/rst28.inc
View File

0
utils/wrflsh.inc → sdk/include/wrflsh.inc
View File

250
utils/Makefile
View File

@ -1,24 +1,48 @@
# SPDX-FileCopyrightText: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
# Supported environments: # Supported environments:
# * GNU on Linux, FreeBSD etc. # * GNU on Linux, FreeBSD etc.
# * GNU on Windows NT (using MinGW/MSYS/Cygwin/WSL) # * GNU on Windows NT (using MinGW/MSYS/Cygwin/WSL)
# #
# Build: # Build:
# make # make [<TARGET> ...]
# Install / Uninstall:
# make [prefix=<PREFIX>] install | uninstall
# Clean: # Clean:
# make clean # make clean | distclean
# #
# SPDX-FileCopyrightText: 2021 Ivan Tatarinov <ivan-tat@ya.ru> # where:
# # <TARGET> is one of values for `BINS' variable prefixed with "build/"
# SPDX-License-Identifier: GPL-3.0-or-later # (see target `all' below).
# <PREFIX> is a prefix directory to install files into.
include ../sdk/common.mk include ../sdk/common.mk
INC_DIR = ../sdk/include srcdir = .
BUILD_DIR = build # Use uppercase for FAT filesystem
AS = sjasmplus prefix ?= .
AFLAGS = --nobanner -I$(INC_DIR) exec_prefix ?= $(prefix)
bindir ?= $(exec_prefix)/BIN
TARGETS=\ # Disable execution mode for FAT filesystem
INSTALL ?= install
INSTALL_PROGRAM ?= $(INSTALL) -m 644
RM = rm -f
INCLUDEDIR = ../sdk/include
AS = sjasmplus
ifeq ($(USE_SJASMPLUS_VERSION),sjasmplus)
AFLAGS = --nobanner
else ifeq ($(USE_SJASMPLUS_VERSION),z00m128)
AFLAGS = --nologo
else
AFLAGS =
endif
AFLAGS += -I$(INCLUDEDIR)
BINS=\
BACK16M\ BACK16M\
BACKZX2\ BACKZX2\
BACKZXD\ BACKZXD\
@ -32,131 +56,155 @@ TARGETS=\
UPGRZXD\ UPGRZXD\
UPGRADE UPGRADE
.PHONY: all TMPS=\
all: $(foreach t,$(TARGETS),$(BUILD_DIR)/$(t)) back32m.def\
upgr32m.def
$(BUILD_DIR): .PHONY: all
all: $(foreach t,$(BINS),build/$(t))
build\
$(DESTDIR)$(bindir):
mkdir -p $@ mkdir -p $@
$(BUILD_DIR)/BACK16M: back16m.asm\ build/BACK16M: $(srcdir)/back16m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/BACKZX2: back32m.asm\ build/BACKZX2: $(srcdir)/back32m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
echo ' define zxdos 1' >back32m.def echo ' define zxdos 1' >back32m.def
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
rm -f back32m.def rm -f back32m.def
$(BUILD_DIR)/BACKZXD: back32m.asm\ build/BACKZXD: $(srcdir)/back32m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
echo ' define zxdos 0' >back32m.def echo ' define zxdos 0' >back32m.def
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
rm -f back32m.def rm -f back32m.def
$(BUILD_DIR)/BACKUP: backup.asm\ build/BACKUP: $(srcdir)/backup.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/CORCLEAN: corclean.asm\ build/CORCLEAN: $(srcdir)/corclean.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/COREBIOS: corebios.asm\ build/COREBIOS: $(srcdir)/corebios.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/ROMSBACK: romsback.asm\ build/ROMSBACK: $(srcdir)/romsback.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/ROMSUPGR: romsupgr.asm\ build/ROMSUPGR: $(srcdir)/romsupgr.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
rdflsh.inc\ $(INCLUDEDIR)/rdflsh.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/UPGR16M: upgr16m.asm\ build/UPGR16M: $(srcdir)/upgr16m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
$(BUILD_DIR)/UPGRZX2: upgr32m.asm\ build/UPGRZX2: $(srcdir)/upgr32m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
echo ' define zxdos 1' >upgr32m.def echo ' define zxdos 1' >upgr32m.def
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
rm -f upgr32m.def rm -f upgr32m.def
$(BUILD_DIR)/UPGRZXD: upgr32m.asm\ build/UPGRZXD: $(srcdir)/upgr32m.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
echo ' define zxdos 0' >upgr32m.def echo ' define zxdos 0' >upgr32m.def
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
rm -f upgr32m.def rm -f upgr32m.def
$(BUILD_DIR)/UPGRADE: upgrade.asm\ build/UPGRADE: $(srcdir)/upgrade.asm\
$(INC_DIR)/zxuno.def\ $(INCLUDEDIR)/zxuno.def\
$(INC_DIR)/esxdos.def\ $(INCLUDEDIR)/esxdos.def\
Print.inc\ $(INCLUDEDIR)/Print.inc\
wrflsh.inc\ $(INCLUDEDIR)/wrflsh.inc\
rst28.inc\ $(INCLUDEDIR)/rst28.inc\
| $(BUILD_DIR) | build
$(AS) $(AFLAGS) --raw=$@ $< $(AS) $(AFLAGS) --raw=$@ $<
# $1 = target
define install_bin_rule =
$$(DESTDIR)$$(bindir)/$1: build/$1 | $$(DESTDIR)$$(bindir)
$$(INSTALL_PROGRAM) $$< $$@
endef
$(foreach t,$(BINS),$(eval $(call install_bin_rule,$(t))))
.PHONY: install
install: $(foreach t,$(BINS),$(DESTDIR)$(bindir)/$(t))
.PHONY: uninstall
uninstall:
$(RM) $(foreach t,$(BINS),$(DESTDIR)$(bindir)/$(t))
.PHONY: clean .PHONY: clean
clean: clean:
rm -f back32m.def upgr32m.def rm -f $(TMPS) $(foreach t,$(BINS),build/$(t))
rm -f $(foreach t,$(TARGETS),$(BUILD_DIR)/$(t))
.PHONY: distclean
distclean:
rm -f $(TMPS)
rm -rf build/*