Merge pull request #59 from ivan-tat/master

utils: moved `esxdos.def` and `zxuno.def` into `sdk/include`

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
 

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\