From 162bad53d880dd8d775b211b0f46058b47a96710 Mon Sep 17 00:00:00 2001
From: Ivan Tatarinov <ivan-tat@ya.ru>
Date: Sat, 24 Apr 2021 13:11:28 +0300
Subject: [PATCH] utils: added ability to build `BACKZXD` and `UPGRZXD` * added
 ability to build `BACKZXD` and `UPGRZXD` in `Makefile` - removed binaries
 `BACKZXD` and `UPGRZXD`. Use `Makefile` to build from sources

---
 utils/BACKZXD     | Bin 460 -> 0 bytes
 utils/Makefile    |  21 +++++++++++++++++++++
 utils/UPGRZXD     | Bin 561 -> 0 bytes
 utils/back32m.asm |   6 +++++-
 utils/upgr32m.asm |   6 +++++-
 5 files changed, 31 insertions(+), 2 deletions(-)
 delete mode 100644 utils/BACKZXD
 delete mode 100644 utils/UPGRZXD

diff --git a/utils/BACKZXD b/utils/BACKZXD
deleted file mode 100644
index 4f63efa48657805ccb985dce220721665f16a1da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmZutze~eF6u#J6ibb$4;-J36L0w9zqnK8$VnI>tptyw?HCXS`Ghz!OuKo)O3ic0h
z>?(r84I!JZW{4p276%7W@tQ&fkvksT_ulv8o!3vhu^LC`Z3H|<*H)H+aTf&VuC+y^
z*Q7C`O4k+E+NXtR4};?aYP!TsE`(*euw5|@cA+#!q@L==dK_!d`5c4yTdaEmw5d-$
zrBIz<UEcU-*+E4v7r`{dR%B<h14~4Pi5_}K{qx)^jfUn7Hs%6%ECvfpGv&q1=0;Ja
zVszFp_iVNUht6*UTn^=8FYzX6CwC&s+j-t+G_>2$B=s+pP;W~~shE7<saUSn+P1y&
zUn*83qNId`X>zI;ydyd>ar~Tzn9d(5In_u(C;nxS?Nhqz!gei~7lI2S(*=T?St$ek
y@np0KA1}$9u;UX8LNw6Edh!*WVZiJ7zjp}2X?Thv1X7#&3b2v*#>UI<zx)6)zPJ_u

diff --git a/utils/Makefile b/utils/Makefile
index 1cd1841..c26cc5e 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -20,6 +20,7 @@ AFLAGS		= --nobanner
 TARGETS=\
  BACK16M\
  BACKZX2\
+ BACKZXD\
  BACKUP\
  CORCLEAN\
  COREBIOS\
@@ -27,6 +28,7 @@ TARGETS=\
  ROMSUPGR\
  UPGR16M\
  UPGRZX2\
+ UPGRZXD\
  UPGRADE
 
 .PHONY: all
@@ -43,7 +45,16 @@ $(BUILD_DIR)/BACK16M: back16m.asm\
 $(BUILD_DIR)/BACKZX2: back32m.asm\
  zxuno.inc\
  | $(BUILD_DIR)
+	echo ' define zxdos 1' >back32m.def
 	$(AS) $(AFLAGS) --raw=$@ $<
+	rm -f back32m.def
+
+$(BUILD_DIR)/BACKZXD: back32m.asm\
+ zxuno.inc\
+ | $(BUILD_DIR)
+	echo ' define zxdos 0' >back32m.def
+	$(AS) $(AFLAGS) --raw=$@ $<
+	rm -f back32m.def
 
 $(BUILD_DIR)/BACKUP: backup.asm\
  zxuno.inc\
@@ -78,7 +89,16 @@ $(BUILD_DIR)/UPGR16M: upgr16m.asm\
 $(BUILD_DIR)/UPGRZX2: upgr32m.asm\
  zxuno.inc\
  | $(BUILD_DIR)
+	echo ' define zxdos 1' >upgr32m.def
 	$(AS) $(AFLAGS) --raw=$@ $<
+	rm -f upgr32m.def
+
+$(BUILD_DIR)/UPGRZXD: upgr32m.asm\
+ zxuno.inc\
+ | $(BUILD_DIR)
+	echo ' define zxdos 0' >upgr32m.def
+	$(AS) $(AFLAGS) --raw=$@ $<
+	rm -f upgr32m.def
 
 $(BUILD_DIR)/UPGRADE: upgrade.asm\
  zxuno.inc\
@@ -87,4 +107,5 @@ $(BUILD_DIR)/UPGRADE: upgrade.asm\
 
 .PHONY: clean
 clean:
+	rm -f back32m.def upgr32m.def
 	rm -f $(foreach t,$(TARGETS),$(BUILD_DIR)/$(t))
diff --git a/utils/UPGRZXD b/utils/UPGRZXD
deleted file mode 100644
index 226010f30c38ed8473237b424f18c0a82ddbcf19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmX>ruE_efkmYT`CwYalwTeOhz6yEyB??9P`6a0-3@6XZC^0ht38wjPD<BXg!gx(m
zLma5uGcP&6s3<kLL?JCFu{cA))0yF<9XIRSN|v`3&+Luz6uupJTY0uffzkSp9XC+a
zj^S<P$@S+u4J3h@gIyGo6N^&7)@9}urxt-NWMfoRS2{n-C{z)w$T=}jy+k3uAT>|H
z&Brm=LoX`A1?Z|;#n6KEqQsQUymW-PLRwLNu0pU2FT+_2MYzM+zz&9UkLoeL&4dV9
zC|ZRoo}Udgj2B{BszP#pZb43JNh-+85Pzd<e_IIFeDba$1B)O7!_B+3HqY!8*zNLf
zUcG+trXoWFBZGq-!}+-e{6KSqQWH}YT#JhGi-6(c0F=CWwoOs^=3QNd6L(b=j+}gG
zcfC$|yTY%R9P4pesPH!MZ6q)dL7{$@MG2QOCWtaSg`14le_7rx#)@nep56o-#9^z!
q%^_3$j9+1mVu#{WxS_0|D1OGM@C&T!B+#gbZx^%ud%O50BJcs)@yx&g

diff --git a/utils/back32m.asm b/utils/back32m.asm
index cb5ad67..e288054 100644
--- a/utils/back32m.asm
+++ b/utils/back32m.asm
@@ -7,6 +7,7 @@
 ; wrongly set to 0.
 ;
 ; Copyright (C) 2019, 2021 Antonio Villena
+; Contributor: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
 ;
 ; This program is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -22,12 +23,15 @@
 ;
 ; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
 ;
+; SPDX-FileContributor: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
+;
 ; SPDX-License-Identifier: GPL-3.0-only
 
 ; Compatible compilers:
 ;   SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
 
-                define  zxdos 1
+                ; definition of "zxdos" flag
+		include back32m.def
 
               IF zxdos=1
                 output  BACKZX2
diff --git a/utils/upgr32m.asm b/utils/upgr32m.asm
index e277cd4..c11f59e 100644
--- a/utils/upgr32m.asm
+++ b/utils/upgr32m.asm
@@ -4,6 +4,7 @@
 ; It must be run while using a "root" mode ROM.
 ;
 ; Copyright (C) 2019, 2021 Antonio Villena
+; Contributor: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
 ;
 ; This program is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -19,12 +20,15 @@
 ;
 ; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
 ;
+; SPDX-FileContributor: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
+;
 ; SPDX-License-Identifier: GPL-3.0-only
 
 ; Compatible compilers:
 ;   SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
 
-                define  zxdos 1
+                ; definition of "zxdos" flag
+                include upgr32m.def
 
               IF zxdos=1
                 output  UPGRZX2