From e05a2099d76c5a4954499611a1882dd38d6191ef Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Sun, 14 Jun 2009 01:20:59 +0000
Subject: [PATCH] Build fix
Detail:
s.makehswis used to pull in various IO header files. There was no good
reason for this, and doing so causes a dependency upon Hdr:Machine.<Machine>
to define which generation of IOC/IOMD is in use - which is a problem if
the C library is to be built where Machine=All.
Admin:
Tested in a Machine=All build.
Version 5.54. Not tagged
---
VersionASM | 6 +++---
VersionNum | 8 ++++----
s/makehswis | 3 ---
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/VersionASM b/VersionASM
index a1919de..6abf0cd 100644
--- a/VersionASM
+++ b/VersionASM
@@ -14,10 +14,10 @@
Module_MajorVersion SETS "5.54"
Module_Version SETA 554
Module_MinorVersion SETS ""
-Module_Date SETS "07 Jun 2009"
-Module_ApplicationDate SETS "07-Jun-09"
+Module_Date SETS "14 Jun 2009"
+Module_ApplicationDate SETS "14-Jun-09"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.54"
-Module_HelpVersion SETS "5.54 (07 Jun 2009)"
+Module_HelpVersion SETS "5.54 (14 Jun 2009)"
END
diff --git a/VersionNum b/VersionNum
index dd41731..8a6f897 100644
--- a/VersionNum
+++ b/VersionNum
@@ -6,18 +6,18 @@
*/
#define Module_MajorVersion_CMHG 5.54
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 07 Jun 2009
+#define Module_Date_CMHG 14 Jun 2009
#define Module_MajorVersion "5.54"
#define Module_Version 554
#define Module_MinorVersion ""
-#define Module_Date "07 Jun 2009"
+#define Module_Date "14 Jun 2009"
-#define Module_ApplicationDate "07-Jun-09"
+#define Module_ApplicationDate "14-Jun-09"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.54"
-#define Module_HelpVersion "5.54 (07 Jun 2009)"
+#define Module_HelpVersion "5.54 (14 Jun 2009)"
#define Module_LibraryVersionInfo "5:54"
diff --git a/s/makehswis b/s/makehswis
index 068a791..921f633 100644
--- a/s/makehswis
+++ b/s/makehswis
@@ -42,8 +42,6 @@
; AAsm source file to make h.swis file from Hdr:SWIs and other headers
GET Hdr:ListOpts
- GET Hdr:Machine.<Machine>
- $GetIO
GBLS SWIClass
@@ -115,7 +113,6 @@ string2 SETS "&":CC:(:STR:value)
GET Hdr:NewErrors
GET Hdr:SWIs
GET Hdr:CPU.Generic26
- GET Hdr:IO.GenericIO
GET Hdr:ModHand
GET swioptions.s
--
GitLab