Adapted version 5.46 to build on 32-bit machines.

Version 5.46, 4.64.2.1. Tagged as 'RISC_OSLib-5_46-4_64_2_1'

Makefile

@@ -52,7 +52,7 @@ LIBDIR  = <Lib$Dir>
 #
 # Generic options:
 #
-AS      = aasm
+AS      = objasm
 CC      = cc
 CMHG    = cmhg
 CP      = copy
@@ -70,7 +70,7 @@ XTENT   = perl build:xtentries >
 
 DIFF    = gnu.diff -df >null:
 
-AFLAGS  = -depend !Depend -Stamp -quit
+AFLAGS  = -depend !Depend
 CFLAGS  = -c -depend !Depend ${INCLUDES} -DDDE -fK
 CPFLAGS = ~cfr~v
 WFLAGS  = ~c~r~v
@@ -609,8 +609,13 @@ lib.clib: ${CLIB_MOD_OBJS}
 	${MODSQZ} $@
 
 # Derived headers:
-derived.swis: s.makehswis h.swisheader s.swioptions
-	${AS} ${AFLAGS} -from s.makehswis -to $@
+derived.swis: o.swis
+	${LD} -bin -o $@ o.SWIs
+	stripnulls $@
+	settype $@ text
+
+o.swis: s.makehswis h.swisheader s.swioptions
+	${AS} ${AFLAGS} s.makehswis -o $@
 	settype $@ text
 
 s.swioptions:

VersionASM

 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.68.
+; Last processed by srccommit version: 1.2.
 ;
                         GBLS    Module_MajorVersion
                         GBLA    Module_Version
@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.46"
 Module_Version          SETA    546
-Module_MinorVersion     SETS    ""
-Module_Date             SETS    "15 Apr 2003"
-Module_ApplicationDate  SETS    "15-Apr-03"
+Module_MinorVersion     SETS    "4.64.2.1"
+Module_Date             SETS    "06 Jan 2004"
+Module_ApplicationDate  SETS    "06-Jan-04"
 Module_ComponentName    SETS    "RISC_OSLib"
 Module_ComponentPath    SETS    "RiscOS/Sources/Lib/RISC_OSLib"
-Module_FullVersion      SETS    "5.46"
-Module_HelpVersion      SETS    "5.46 (15 Apr 2003)"
+Module_FullVersion      SETS    "5.46 (4.64.2.1)"
+Module_HelpVersion      SETS    "5.46 (06 Jan 2004) 4.64.2.1"
                         END

VersionNum

 /* (5.46)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.68.
+ * Last processed by srccommit version: 1.2.
  *
  */
 #define Module_MajorVersion_CMHG        5.46
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                15 Apr 2003
+#define Module_MinorVersion_CMHG        4.64.2.1
+#define Module_Date_CMHG                06 Jan 2004
 
 #define Module_MajorVersion             "5.46"
 #define Module_Version                  546
-#define Module_MinorVersion             ""
-#define Module_Date                     "15 Apr 2003"
+#define Module_MinorVersion             "4.64.2.1"
+#define Module_Date                     "06 Jan 2004"
 
-#define Module_ApplicationDate          "15-Apr-03"
+#define Module_ApplicationDate          "06-Jan-04"
 
 #define Module_ComponentName            "RISC_OSLib"
 #define Module_ComponentPath            "RiscOS/Sources/Lib/RISC_OSLib"
 
-#define Module_FullVersion              "5.46"
-#define Module_HelpVersion              "5.46 (15 Apr 2003)"
+#define Module_FullVersion              "5.46 (4.64.2.1)"
+#define Module_HelpVersion              "5.46 (06 Jan 2004) 4.64.2.1"
 #define Module_LibraryVersionInfo       "5:46"

s/makehswis

@@ -104,6 +104,8 @@ string2 SETS    "&":CC:(:STR:value)
 ;SoundWorkSpace * &01F04000
         GET     Hdr:PublicWS
 
+        AREA    |Text$Data|, DATA
+
 ; First output the file header
 	BIN	h.swisheader