From 6dce5a720b822bd9512032ae1d68d83d0fbbcbef Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Thu, 6 May 2021 23:31:13 +0300 Subject: [PATCH 1/2] firmware/scroll: improved `Makefile` a bit --- firmware/scroll/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/firmware/scroll/Makefile b/firmware/scroll/Makefile index e34d399..2d43673 100644 --- a/firmware/scroll/Makefile +++ b/firmware/scroll/Makefile @@ -15,7 +15,14 @@ include ../../sdk/common.mk FUENTEABIN = tools/build/FuenteABin$(EXESUFFIX) AS = sjasmplus -AFLAGS = --nobanner -I../../sdk/include +ifeq ($(USE_SJASMPLUS_VERSION),sjasmplus) +AFLAGS = --nobanner +else ifeq ($(USE_SJASMPLUS_VERSION),z00m128) +AFLAGS = --nologo +else +AFLAGS = +endif +AFLAGS += -I../../sdk/include .PHONY: all all: scroll.tap @@ -23,10 +30,12 @@ all: scroll.tap scroll.tap: scrolldesc.bin GenTape $@ basic "SCROLL" 0 $< -scrolldesc.bin: scrolldesc.asm scroll.bin scroll.bin.zx7b - echo ' define filesize $(shell stat -c %s scroll.bin)' >define.asm +scrolldesc.bin: scrolldesc.asm define.asm scroll.bin.zx7b $(AS) $(AFLAGS) --raw=$@ $< +define.asm: scroll.bin + echo ' define filesize $(shell stat -c %s $<)' >$@ + scroll.bin.zx7b: scroll.bin zx7b $< $@ @@ -56,7 +65,8 @@ install:; uninstall:; .PHONY: clean -clean: +clean: | tools + $(MAKE) -w -C $| $@ rm -f music.bin fuente6x8.bin fondo.rcs scroll.bin scroll.bin.zx7b define.asm scrolldesc.bin scroll.tap .PHONY: distclean From 9b7b2efb6a01e60bfbdc6a50895ba7df914a33f2 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Fri, 7 May 2021 18:01:47 +0300 Subject: [PATCH 2/2] firmware/scroll: added notice in `music.stc.license` file --- firmware/scroll/music.stc.license | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/scroll/music.stc.license b/firmware/scroll/music.stc.license index fd63d12..ec5f5c4 100644 --- a/firmware/scroll/music.stc.license +++ b/firmware/scroll/music.stc.license @@ -6,6 +6,8 @@ SPDX-FileChecksum: SHA1: c45309ee13cc7cb0cbb7becb2eda9ecc4d905788 SPDX-FileCopyrightText: Copyright (C) 2016 Michal B. (a.k.a Yerzmyey) +SPDX-FileNotice: Exclusive track for ZX-Uno project. + SPDX-License-Identifier: CC-BY-SA-4.0 SPDX-FileComment: https://zxart.ee/eng/authors/y/yerzmyey/