Clean up

Make version include files common.
6 years ago · 2c2df76f15
14 changed files with 11 additions and 30 deletions
--- a/Source/CBIOS/cbios.asm
+++ b/Source/CBIOS/cbios.asm
@ -50,7 +50,7 @@ DEF_IOBYTE	.EQU	%10010100	; DEFAULT IOBYTE VALUE
 DEV_BAT		.EQU	$FE		; BAT:
 DEV_NUL		.EQU	$FF		; NUL:
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 #INCLUDE "config.asm"
 ;
--- a/Source/CPM22/loader.asm
+++ b/Source/CPM22/loader.asm
@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$E600		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$D000		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
--- a/Source/CPM22/ver.inc
+++ b/Source/CPM22/ver.inc
@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
--- a/Source/CPM3/Build.cmd
+++ b/Source/CPM3/Build.cmd
@ -9,7 +9,8 @@ set TASMTABS=%TOOLS%\tasm32

 set ZXBINDIR=%TOOLS%/cpm/bin/
 set ZXLIBDIR=%TOOLS%/cpm/lib/
-set ZXINCDIR=%TOOLS%/cpm/include/
+rem set ZXINCDIR=%TOOLS%/cpm/include/
+set ZXINCDIR=../

 echo.
 echo.
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@ -11,6 +11,8 @@ OTHERS += biosldrc.rel biosldrd.rel
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc

+export ZXINCDIR := ../
+
 BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel 
 BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel
 COMMA := ,
--- a/Source/CPM3/boot.z80
+++ b/Source/CPM3/boot.z80
@ -16,7 +16,7 @@
 	extrn	addhla, bcd2bin, bin2bcd
 	;extrn	cout, phex8
 	
-	include	ver.inc
+	include	c:ver.lib
 	
 bdos	equ 5

--- a/Source/CPM3/loader.asm
+++ b/Source/CPM3/loader.asm
@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$0100		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$0100		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
--- a/Source/CPM3/ver.inc
+++ b/Source/CPM3/ver.inc
@ -1,7 +0,0 @@
-rmj	equ	2
-rmn	equ	9
-rup	equ	2
-rtp	equ	0
-biosver	macro
-	db	"2.9.2-pre.34"
-	endm
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@ -18,7 +18,7 @@
 ;
 ; INCLUDE VERSION
 ;
-#INCLUDE "ver.inc"			; ADD BIOSVER
+#INCLUDE "../ver.inc"			; ADD BIOSVER
 ;
 FALSE		.EQU 	0
 TRUE		.EQU 	~FALSE
--- a/Source/HBIOS/ver.inc
+++ b/Source/HBIOS/ver.inc
@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
--- a/Source/ZPM3/loader.asm
+++ b/Source/ZPM3/loader.asm
@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$0100		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$0100		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
--- a/Source/ZSDOS/loader.asm
+++ b/Source/ZSDOS/loader.asm
@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$E600		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$D000		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
--- a/Source/ZSDOS/ver.inc
+++ b/Source/ZSDOS/ver.inc
@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
--- a/Source/CBIOS/ver.inc
+++ b/Source/CBIOS/ver.inc