Change to use objasm not aasm

Version 2.74. Tagged as 'Alarm-2_74'

Makefile

@@ -20,6 +20,7 @@
 # Date       Name   Description
 # ----       ----   -----------
 # 05-Nov-94  AMcC   Updated for Black build
+# 24-Jul-03  RPS    Use objasm
 #
 
 #
@@ -43,13 +44,13 @@ RESAPP = <resource$dir>.Apps.${APP}
 # Generic options:
 #
 MKDIR   = cdir
-AS      = aasm
+ARMASM  = objasm
 CP      = copy
 RM      = remove
 SQUISH    = squish
 WIPE    = -wipe
 
-AFLAGS  = ${THROWBACK} -depend !Depend -nocache -stamp -quit -module
+AFLAGS  = ${THROWBACK} -depend !Depend -stamp -quit
 CPFLAGS = ~cfr~v
 SQFLAGS = -nolist
 WFLAGS  = ~c~v
@@ -120,6 +121,7 @@ clean:
 	${RM} ${RDIR}.!RunLink
 	${RM} ${RDIR}.Code
 	${RM} ${MSGS}
+	${WIPE} o          ${WFLAGS}
 	${WIPE} crunched.* ${WFLAGS}
 	@echo ${COMPONENT}: cleaned
 
@@ -127,14 +129,18 @@ clean:
 # Development rules:
 # 
 ResVsn:
-	${AS} ${AFLAGS} -from s.ResVsn -to rm.AlarmRes
+	${MKDIR} o
+	${ARMASM} ${AFLAGS} -o o.AlarmRes s.ResVsn
+	Link -rmf -o rm.AlarmRes o.AlarmRes 
 
 #
 # Static dependencies:
 #
 
 ${ROM_MODULE}: s.Main ${MSGS} ${RESFILES}
-	${AS} ${AFLAGS} -from s.Main -to $@
+	${MKDIR} o
+	${ARMASM} ${AFLAGS} -o o.Main s.Main
+	Link -rmf -o $@ o.Main 
 
 ${MSGS}: LocalRes:Messages VersionASM
 	awk -f awk.Version LocalRes:Messages > $@

Resources/UK/!Help

+
+                     !Alarm
+                     ======
+
 The Alarm application displays a clock on the icon
 bar. It can also be used to set 'alarms' to remind
 you of further events. You can save the alarms to

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.73"
-Module_Version          SETA    273
+Module_MajorVersion     SETS    "2.74"
+Module_Version          SETA    274
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "14 Nov 2002"
-Module_ApplicationDate  SETS    "14-Nov-02"
+Module_Date             SETS    "24 Jul 2003"
+Module_ApplicationDate  SETS    "24-Jul-03"
 Module_ComponentName    SETS    "Alarm"
 Module_ComponentPath    SETS    "RiscOS/Sources/Apps/Alarm"
-Module_FullVersion      SETS    "2.73"
-Module_HelpVersion      SETS    "2.73 (14 Nov 2002)"
+Module_FullVersion      SETS    "2.74"
+Module_HelpVersion      SETS    "2.74 (24 Jul 2003)"
                         END

VersionNum

-/* (2.73)
+/* (2.74)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        2.73
+#define Module_MajorVersion_CMHG        2.74
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                14 Nov 2002
+#define Module_Date_CMHG                24 Jul 2003
 
-#define Module_MajorVersion             "2.73"
-#define Module_Version                  273
+#define Module_MajorVersion             "2.74"
+#define Module_Version                  274
 #define Module_MinorVersion             ""
-#define Module_Date                     "14 Nov 2002"
+#define Module_Date                     "24 Jul 2003"
 
-#define Module_ApplicationDate          "14-Nov-02"
+#define Module_ApplicationDate          "24-Jul-03"
 
 #define Module_ComponentName            "Alarm"
 #define Module_ComponentPath            "RiscOS/Sources/Apps/Alarm"
 
-#define Module_FullVersion              "2.73"
-#define Module_HelpVersion              "2.73 (14 Nov 2002)"
-#define Module_LibraryVersionInfo       "2:73"
+#define Module_FullVersion              "2.74"
+#define Module_HelpVersion              "2.74 (24 Jul 2003)"
+#define Module_LibraryVersionInfo       "2:74"

s/Main

@@ -23,6 +23,8 @@
 ; 19-Feb-90     0.01    File created
 ;
 
+        AREA    |Alarm$$Code|, CODE, READONLY, PIC
+
 Module_BaseAddr
 
         GET     s.AppName         ; read ApplicationName
@@ -36,9 +38,6 @@ Module_BaseAddr
         GET     Hdr:ResourceFS
         GET     VersionASM
 
-        LEADR   Module_LoadAddr
-
-
 ; **************** Module code starts here **********************
 
         ASSERT  (.-Module_BaseAddr) = 0
@@ -81,7 +80,7 @@ App_ModFlag DCD     ModuleFlag_32bit
 ;       App_Init - Initialisation entry
 ;
 
-App_Init ENTRY "r0"
+App_Init Entry "r0"
 
         ADR     R0, resourcefsfiles
         SWI     XResourceFS_RegisterFiles   ; ignore errors (starts on Service_ResourceFSStarting)
@@ -93,7 +92,7 @@ App_Init ENTRY "r0"
 ;       App_Die - Die entry
 ;
 
-App_Die ENTRY "r0"
+App_Die Entry "r0"
 
         ADR     R0, resourcefsfiles
         SWI     XResourceFS_DeregisterFiles
@@ -123,7 +122,7 @@ App_UService
 ;       R3 = workspace pointer for module
 ; Out   R2 called with R0 -> files, R3 -> workspace
 
-svc_resourcefsstarting ENTRY "R0-R3"
+svc_resourcefsstarting Entry "R0-R3"
 
         ADR     R0, resourcefsfiles
         MOV     LR, PC                          ; get return address