Changed to use objasm.

2D templates and sprites23 nuked.
Now determines size of private sprites at run time rather than a
hardcoded 12k.
Updated version number in Messages and Templates.

Version 1.89. Tagged as 'Maestro-1_89'

!MkClean,fd7

@@ -14,3 +14,4 @@
 |
 Dir <Obey$Dir>
 amu_machine clean
+StripDepnd Makefile

!MkInstEx,fd7

+| Copyright 2003 Tematic Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+Dir <Obey$Dir>
+amu_machine install INSTDIR=<install$dir>.HardDisc4.Sound TARGET=Examples

!MkInstall,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine install INSTDIR=<install$dir>.HardDisc4.Apps
+amu_machine install INSTDIR=<install$dir>.HardDisc4.Apps TARGET=Maestro

Makefile

@@ -29,7 +29,7 @@ COMPONENT  = Maestro
 APP        = !${COMPONENT}
 RDIR       = Resources
 LDIR       = ${RDIR}.${LOCALE}
-INSTDIR    = ${INSTDIR}.${APP}
+INSTAPP    = ${INSTDIR}.${APP}
 
 #
 # Modules to load before squishing
@@ -38,14 +38,15 @@ PDRIVER    = <Build$Dir>.Modules.PDriver
 
 # Generic options:
 #
-AS      = aasm
-MKDIR   = cdir
+AS      = objasm
+LD      = link
+MKDIR   = do mkdir -p
 CP      = copy
 RM      = remove
 SQUISH  = squish
 WIPE    = -wipe
 
-AFLAGS  = ${THROWBACK} -depend !Depend -nocache -stamp -quit
+AFLAGS  = ${THROWBACK} -depend !Depend -stamp -quit
 CPFLAGS = ~cfr~v
 SQFLAGS = -nolist
 WFLAGS  = ~c~v
@@ -69,27 +70,37 @@ FILES =\
 all: ${FILES}
 	@echo ${COMPONENT}: Application built (Disc}
 
-install: ${FILES}
+install: install_${TARGET}
+
+install_Examples:
 	${MKDIR} ${INSTDIR}
-	${CP} ${RDIR}.!Boot      ${INSTDIR}.!Boot      ${CPFLAGS}
-	${CP} ${LDIR}.!Help      ${INSTDIR}.!Help      ${CPFLAGS}
-	${CP} ${LDIR}.!Run       ${INSTDIR}.!Run       ${CPFLAGS}
-	${CP} ${RDIR}.!RunImage  ${INSTDIR}.!RunImage  ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites   ${INSTDIR}.!Sprites   ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites22 ${INSTDIR}.!Sprites22 ${CPFLAGS}
-	${CP} ${RDIR}.EnsureRMA  ${INSTDIR}.EnsureRMA  ${CPFLAGS}
-	${CP} ${LDIR}.Messages   ${INSTDIR}.Messages   ${CPFLAGS}
-	${CP} ${RDIR}.Sprites    ${INSTDIR}.Sprites    ${CPFLAGS}
-	${CP} ${RDIR}.Sprites22  ${INSTDIR}.Sprites22  ${CPFLAGS}
-	${CP} ${LDIR}.Templates  ${INSTDIR}.Templates  ${CPFLAGS}
+	${CP} Examples ${INSTDIR} ${CPFLAGS}
 	Access ${INSTDIR} /r
 	Access ${INSTDIR}.* lr/r
+	@echo ${COMPONENT}: Example files installed {Disc}
+
+install_ install_Maestro: ${FILES}
+	${MKDIR} ${INSTAPP}
+	${CP} ${RDIR}.!Boot      ${INSTAPP}.!Boot      ${CPFLAGS}
+	${CP} ${LDIR}.!Help      ${INSTAPP}.!Help      ${CPFLAGS}
+	${CP} ${LDIR}.!Run       ${INSTAPP}.!Run       ${CPFLAGS}
+	${CP} ${RDIR}.!RunImage  ${INSTAPP}.!RunImage  ${CPFLAGS}
+	${CP} ${RDIR}.!Sprites   ${INSTAPP}.!Sprites   ${CPFLAGS}
+	${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
+	${CP} ${RDIR}.EnsureRMA  ${INSTAPP}.EnsureRMA  ${CPFLAGS}
+	${CP} ${LDIR}.Messages   ${INSTAPP}.Messages   ${CPFLAGS}
+	${CP} ${RDIR}.Sprites    ${INSTAPP}.Sprites    ${CPFLAGS}
+	${CP} ${RDIR}.Sprites22  ${INSTAPP}.Sprites22  ${CPFLAGS}
+	${CP} ${LDIR}.Templates  ${INSTAPP}.Templates  ${CPFLAGS}
+	Access ${INSTAPP} /r
+	Access ${INSTAPP}.* lr/r
 	@echo ${COMPONENT}: Application installed {Disc}
 
 clean:
 	${RM} ${RDIR}.!RunImage
 	${RM} ${RDIR}.EnsureRMA
 	${WIPE} crunched.* ${WFLAGS}
+	${WIPE} o ${WFLAGS}
 	@echo ${COMPONENT}: cleaned
 
 #
@@ -102,8 +113,12 @@ ${RDIR}.!RunImage: crunched.!RunImage
 crunched.!RunImage: bas.!RunImage
 	crunch.!RunImage; BASIC
 
-$(RDIR).EnsureRMA: s.EnsureRMA
-	${AS} ${AFLAGS} -from s.EnsureRMA -to $@
+o.EnsureRMA: s.EnsureRMA
+	${MKDIR} o
+	${AS} ${AFLAGS} -o $@ s.EnsureRMA
+
+$(RDIR).EnsureRMA: o.EnsureRMA
+	${LD} -bin -o $@ o.EnsureRMA
 	SetType $@ Utility
 
 #---------------------------------------------------------------------------

Resources/UK/Messages

-Version:2.13 (13-Dec-94)
+Version:1.89 (27-Nov-02)
 JobFailed:Printer job failed
 SpriteName:!Maestro
 Maestro:Maestro
@@ -162,7 +162,7 @@ OutMem2:Menu too big
 OutMem3:Not enough memory available for music storage
 SSIU:Sound system in use by Maestro
 IntErr:%0 (internal error %1)
-ExProg: - Exit program?
+ExProg: - exit program?
 NotMusic:'%0' is not a valid music file
 Yes:Yes
 No:No

VersionNum

-/* (1.88)
+/* (1.89)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        1.88
+#define Module_MajorVersion_CMHG        1.89
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                21 Feb 2003
 
-#define Module_MajorVersion             "1.88"
-#define Module_Version                  188
+#define Module_MajorVersion             "1.89"
+#define Module_Version                  189
 #define Module_MinorVersion             ""
 #define Module_Date                     "21 Feb 2003"
 
@@ -18,6 +18,6 @@
 #define Module_ComponentName            "Maestro"
 #define Module_ComponentPath            "RiscOS/Sources/Apps/Maestro"
 
-#define Module_FullVersion              "1.88"
-#define Module_HelpVersion              "1.88 (21 Feb 2003)"
-#define Module_LibraryVersionInfo       "1:88"
+#define Module_FullVersion              "1.89"
+#define Module_HelpVersion              "1.89 (21 Feb 2003)"
+#define Module_LibraryVersionInfo       "1:89"

s/EnsureRMA

@@ -22,7 +22,9 @@
         GET     Hdr:ModHand
         GET     Hdr:Proc
 
-        ENTRY   "r0-r3"
+        AREA    |Asm$$Code|, CODE, READONLY, PIC
+
+        Entry   "r0-r3"
 
         MOV     r0, #ModHandReason_RMADesc
         SWI     XOS_Module