From e9fcc99ea4efe516de53afc7d35efbe3f8c75979 Mon Sep 17 00:00:00 2001
From: Ivan Tatarinov <ivan-tat@ya.ru>
Date: Sun, 25 Apr 2021 11:27:06 +0300
Subject: [PATCH 1/2] utils: moved `esxdos.def` and `zxuno.def` into
 `sdk/include`

---
 {utils => sdk/include}/esxdos.def |  0
 {utils => sdk/include}/zxuno.def  |  0
 utils/Makefile                    | 49 ++++++++++++++++---------------
 3 files changed, 25 insertions(+), 24 deletions(-)
 rename {utils => sdk/include}/esxdos.def (100%)
 rename {utils => sdk/include}/zxuno.def (100%)

diff --git a/utils/esxdos.def b/sdk/include/esxdos.def
similarity index 100%
rename from utils/esxdos.def
rename to sdk/include/esxdos.def
diff --git a/utils/zxuno.def b/sdk/include/zxuno.def
similarity index 100%
rename from utils/zxuno.def
rename to sdk/include/zxuno.def
diff --git a/utils/Makefile b/utils/Makefile
index 7df917f..4fa787f 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -13,9 +13,10 @@
 
 include ../sdk/common.mk
 
+INC_DIR		= ../sdk/include
 BUILD_DIR	= build
 AS		= sjasmplus
-AFLAGS		= --nobanner
+AFLAGS		= --nobanner -I$(INC_DIR)
 
 TARGETS=\
  BACK16M\
@@ -38,8 +39,8 @@ $(BUILD_DIR):
 	mkdir -p $@
 
 $(BUILD_DIR)/BACK16M: back16m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  rst28.inc\
@@ -47,8 +48,8 @@ $(BUILD_DIR)/BACK16M: back16m.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/BACKZX2: back32m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  rst28.inc\
@@ -58,8 +59,8 @@ $(BUILD_DIR)/BACKZX2: back32m.asm\
 	rm -f back32m.def
 
 $(BUILD_DIR)/BACKZXD: back32m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  rst28.inc\
@@ -69,8 +70,8 @@ $(BUILD_DIR)/BACKZXD: back32m.asm\
 	rm -f back32m.def
 
 $(BUILD_DIR)/BACKUP: backup.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  rst28.inc\
@@ -78,7 +79,7 @@ $(BUILD_DIR)/BACKUP: backup.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/CORCLEAN: corclean.asm\
- zxuno.def\
+ $(INC_DIR)/zxuno.def\
  Print.inc\
  rdflsh.inc\
  wrflsh.inc\
@@ -87,8 +88,8 @@ $(BUILD_DIR)/CORCLEAN: corclean.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/COREBIOS: corebios.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  wrflsh.inc\
@@ -97,8 +98,8 @@ $(BUILD_DIR)/COREBIOS: corebios.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/ROMSBACK: romsback.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  rst28.inc\
@@ -106,8 +107,8 @@ $(BUILD_DIR)/ROMSBACK: romsback.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/ROMSUPGR: romsupgr.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  rdflsh.inc\
  wrflsh.inc\
@@ -116,8 +117,8 @@ $(BUILD_DIR)/ROMSUPGR: romsupgr.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/UPGR16M: upgr16m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  wrflsh.inc\
  rst28.inc\
@@ -125,8 +126,8 @@ $(BUILD_DIR)/UPGR16M: upgr16m.asm\
 	$(AS) $(AFLAGS) --raw=$@ $<
 
 $(BUILD_DIR)/UPGRZX2: upgr32m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  wrflsh.inc\
  rst28.inc\
@@ -136,8 +137,8 @@ $(BUILD_DIR)/UPGRZX2: upgr32m.asm\
 	rm -f upgr32m.def
 
 $(BUILD_DIR)/UPGRZXD: upgr32m.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  wrflsh.inc\
  rst28.inc\
@@ -147,8 +148,8 @@ $(BUILD_DIR)/UPGRZXD: upgr32m.asm\
 	rm -f upgr32m.def
 
 $(BUILD_DIR)/UPGRADE: upgrade.asm\
- zxuno.def\
- esxdos.def\
+ $(INC_DIR)/zxuno.def\
+ $(INC_DIR)/esxdos.def\
  Print.inc\
  wrflsh.inc\
  rst28.inc\

From 317d5fb33947ebf0a415bbedb57f5a30db2cb08b Mon Sep 17 00:00:00 2001
From: Ivan Tatarinov <ivan-tat@ya.ru>
Date: Sun, 25 Apr 2021 11:42:02 +0300
Subject: [PATCH 2/2] sdk: updated `README.md` (added `include` sub-dir)

---
 sdk/README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sdk/README.md b/sdk/README.md
index 6eb6d41..0d41baa 100644
--- a/sdk/README.md
+++ b/sdk/README.md
@@ -14,8 +14,13 @@ z88dk is distributed under [Clarified Artistic](https://spdx.org/licenses/ClArti
 
 # 1. General information
 
-The source code of local tools is in `src` directory. Compiled binaries of them are placed in `bin` directory.  
-Downloaded tools are placed in sub-directories of `src`. See Makefiles for details.
+The structure of `sdk` folder:
+
+Directory | Description
+----|----
+`bin` | Compiled binaries of tools.
+`include` | Header files (`.def`, `.h` etc.) to be included in other sources (assembler, C, etc.).
+`src` | The source code of local and downloadable tools. See Makefiles for details.
 
 ## 1.1. Copyright and licensing information for files