From 54d7dc49ede198154eafaccdb794551062b09ab6 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Tue, 25 May 2021 19:55:33 +0300 Subject: [PATCH 1/4] sdk/windows-x86/bin: added `sjasmplus.exe` to `.gitignore` --- sdk/windows-x86/bin/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sdk/windows-x86/bin/.gitignore diff --git a/sdk/windows-x86/bin/.gitignore b/sdk/windows-x86/bin/.gitignore new file mode 100644 index 0000000..3e5d7b0 --- /dev/null +++ b/sdk/windows-x86/bin/.gitignore @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Ivan Tatarinov +# +# SPDX-License-Identifier: CC0-1.0 + +sjasmplus.exe From d1a73fc4665e9e5aab5eb61d2dd0f7a5a3e69d72 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Tue, 25 May 2021 21:04:33 +0300 Subject: [PATCH 2/4] sdk/README.md: fixed table structure --- sdk/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/README.md b/sdk/README.md index 28c98d6..3ff7277 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -97,7 +97,7 @@ Value of `TARGET` | Origin | Description `tools` | `src/tools` | tools Value of `BUILD` | Target directory | Target system -----|---- +----|----|---- `mingw32` | `windows-x86` | Windows with i686 architecture (32-bits) `mingw64` | `windows-x86_64` | Windows with AMD64 architecture (64-bits) From 788464ad56309f1916680e94ed17bf54aaf36918 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Fri, 4 Jun 2021 14:30:28 +0300 Subject: [PATCH 3/4] firmware,utils: tiny source code fixes/modifications --- firmware/bootloader.asm | 2 +- utils/zxunocfg.asm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/firmware/bootloader.asm b/firmware/bootloader.asm index 9e0acb2..91d95c6 100644 --- a/firmware/bootloader.asm +++ b/firmware/bootloader.asm @@ -1,4 +1,4 @@ -; firmware.asm +; bootloader.asm ; ; Copyright (C) 2016-2021 Antonio Villena ; Contributors: diff --git a/utils/zxunocfg.asm b/utils/zxunocfg.asm index 0af540f..7e96acd 100644 --- a/utils/zxunocfg.asm +++ b/utils/zxunocfg.asm @@ -414,8 +414,7 @@ CheckOptionTail inc hl cp " " ret z - inc sp - inc sp + pop hl ; not used jr ParseParam.BadOption ;------------------------------------------------------ From ef3881834467bfc0079afb5374ee53e872c4df96 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Fri, 4 Jun 2021 14:55:35 +0300 Subject: [PATCH 4/4] software: added `Makefile` --- Makefile | 18 ++++----- software/Makefile | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 software/Makefile diff --git a/Makefile b/Makefile index 60a39e5..ab51447 100644 --- a/Makefile +++ b/Makefile @@ -34,19 +34,15 @@ TARGETS=\ utils\ software -SOFTWARE_SUBDIRS=\ - esprst\ - iwconfig - .PHONY: all -all: $(foreach t,$(TARGETS),install-$(t)) +all: install @echo 'Done.' # utils .PHONY: build-utils build-utils: | utils - $(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) + $(MAKE) -w -C $| .PHONY: install-utils install-utils: | utils @@ -68,23 +64,23 @@ distclean-utils: | utils .PHONY: build-software build-software: | software - $(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) + $(MAKE) -w -C $| .PHONY: install-software install-software: | software - for d in $(SOFTWARE_SUBDIRS); do d=$|/$$d; $(MAKE) -w -C $$d bindir=$$(realpath --relative-to=$$d $(bindir)) install; done + $(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) install .PHONY: uninstall-software uninstall-software: | software - for d in $(SOFTWARE_SUBDIRS); do d=$|/$$d; $(MAKE) -w -C $$d bindir=$$(realpath --relative-to=$$d $(bindir)) uninstall; done + $(MAKE) -w -C $| bindir=$(shell realpath --relative-to=$| $(bindir)) uninstall .PHONY: clean-software clean-software: | software - for d in $(SOFTWARE_SUBDIRS); do d=$|/$$d; $(MAKE) -w -C $$d bindir=$$(realpath --relative-to=$$d $(bindir)) clean; done + $(MAKE) -w -C $| clean .PHONY: distclean-software distclean-software: | software - for d in $(SOFTWARE_SUBDIRS); do d=$|/$$d; $(MAKE) -w -C $$d bindir=$$(realpath --relative-to=$$d $(bindir)) distclean; done + $(MAKE) -w -C $| distclean # all diff --git a/software/Makefile b/software/Makefile new file mode 100644 index 0000000..17dbfb7 --- /dev/null +++ b/software/Makefile @@ -0,0 +1,97 @@ +# SPDX-FileCopyrightText: 2021 Ivan Tatarinov +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# Supported environments: +# * GNU on Linux, FreeBSD etc. +# * GNU on Windows NT (using MinGW/MSYS/Cygwin/WSL) +# +# Build the project: +# make [all] +# Compile only: +# make build | build- +# Install: +# make install | install- +# Uninstall: +# make uninstall | uninstall- +# Clean: +# make clean | clean- +# make distclean | distclean- +# +# where: +# is one of the values for `SUBDIRS' variable. + +include ../sdk/common.mk + +# Use uppercase for FAT filesystem +prefix ?= . +exec_prefix ?= $(prefix) +bindir ?= $(exec_prefix)/BIN + +SUBDIRS=\ + esprst\ + iwconfig + +.PHONY: all +all: build + @echo 'Done.' + +.PHONY: $(foreach t,$(SUBDIRS),build-$(t)) + +define build_rule= +build-$1: | $1 + $$(MAKE) -w -C $$| +endef + +$(foreach d,$(SUBDIRS),$(eval $(call build_rule,$(d)))) + +.PHONY: $(foreach t,$(SUBDIRS),install-$(t)) + +define install_rule= +install-$1: | $1 + $$(MAKE) -w -C $$| bindir=$$(shell realpath --relative-to=$$| $$(bindir)) install +endef + +$(foreach d,$(SUBDIRS),$(eval $(call install_rule,$(d)))) + +.PHONY: $(foreach t,$(SUBDIRS),uninstall-$(t)) + +define uninstall_rule= +uninstall-$1: | $1 + $$(MAKE) -w -C $$| bindir=$$(shell realpath --relative-to=$$| $$(bindir)) uninstall +endef + +$(foreach d,$(SUBDIRS),$(eval $(call uninstall_rule,$(d)))) + +.PHONY: $(foreach t,$(SUBDIRS),clean-$(t)) + +define clean_rule= +clean-$1: | $1 + $$(MAKE) -w -C $$| clean +endef + +$(foreach d,$(SUBDIRS),$(eval $(call clean_rule,$(d)))) + +.PHONY: $(foreach t,$(SUBDIRS),distclean-$(t)) + +define distclean_rule= +distclean-$1: | $1 + $$(MAKE) -w -C $$| distclean +endef + +$(foreach d,$(SUBDIRS),$(eval $(call distclean_rule,$(d)))) + +.PHONY: build +build: $(foreach t,$(SUBDIRS),build-$(t)) + +.PHONY: install +install: $(foreach t,$(SUBDIRS),install-$(t)) + +.PHONY: uninstall +uninstall: $(foreach t,$(SUBDIRS),uninstall-$(t)) + +.PHONY: clean +clean: $(foreach t,$(SUBDIRS),clean-$(t)) + +.PHONY: distclean +distclean: $(foreach t,$(SUBDIRS),distclean-$(t))