Commit ee9242f8 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Updated build structure to use the shared AAsmModule makefile.

  Updated to build using objasm instead of aasm.
  Sources changed to be objasm-compatible.
Admin:
  Requires Library 0.72 or later.
  Requires BuildSys 3.09 or later.
  Requires Env 0.65 or later.

Version 1.12. Tagged as 'SpriteUtil-1_12'
parent 6e8b54a0
......@@ -19,57 +19,15 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 23-Mar-01 SNB Recreated
#
#
# Generic options:
#
MKDIR = cdir
AS = aasm
CP = copy
RM = remove
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
CPFLAGS = ~cfr~v
TOKENISE = tokenise
TOKENS = Hdr:Tokens
#
# Program specific options:
#
COMPONENT = SpriteUtil
SOURCE = s.SpriteUtil
TARGET = rm.SpriteUtil
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export:
@echo ${COMPONENT}: export complete
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
${RM} s.TokHelpSrc
@echo ${COMPONENT}: cleaned
resources:
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
@echo ${COMPONENT}: resource files copied
${TARGET}: ${SOURCE} s.TokHelpSrc
${AS} ${ASFLAGS} ${SOURCE}
COMPONENT = SpriteUtils
TARGET = SpriteUtil
HELPSRC = HelpSrc
TOKHELPSRC= ${TOKENSOURCE}
s.TokHelpSrc: ${TOKENS} HelpSrc
${TOKENISE} ${TOKENS} HelpSrc $@
include StdTools
include AAsmModule
# Dynamic dependencies:
......@@ -6,9 +6,19 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "1.11"
Module_Version SETA 111
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.12"
Module_Version SETA 112
Module_MinorVersion SETS ""
Module_Date SETS "06 Jun 2000"
Module_FullVersion SETS "1.11"
Module_Date SETS "23 Mar 2001"
Module_ApplicationDate2 SETS "23-Mar-01"
Module_ApplicationDate4 SETS "23-Mar-2001"
Module_ComponentName SETS "SpriteUtil"
Module_ComponentPath SETS "RiscOS/Sources/Video/Render/SpriteUtil"
Module_FullVersion SETS "1.12"
Module_HelpVersion SETS "1.12 (23 Mar 2001)"
END
/* (1.11)
/* (1.12)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.11
#define Module_MajorVersion_CMHG 1.12
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Jun 2000
#define Module_Date_CMHG 23 Mar 2001
#define Module_MajorVersion "1.11"
#define Module_Version 111
#define Module_MajorVersion "1.12"
#define Module_Version 112
#define Module_MinorVersion ""
#define Module_Date "06 Jun 2000"
#define Module_Date "23 Mar 2001"
#define Module_FullVersion "1.11"
#define Module_ApplicationDate2 "23-Mar-01"
#define Module_ApplicationDate4 "23-Mar-2001"
#define Module_ComponentName "SpriteUtil"
#define Module_ComponentPath "RiscOS/Sources/Video/Render/SpriteUtil"
#define Module_FullVersion "1.12"
#define Module_HelpVersion "1.12 (23 Mar 2001)"
......@@ -74,7 +74,7 @@ gs_lookup_print_string_zero ROUT
; Out r7-r11 preserved (always called last in *command handlers)
; All other registers may be trashed
gs_lookup_print_string_four ENTRY "r7"
gs_lookup_print_string_four Entry "r7"
BL open_message_file_workspace
EXIT VS
......@@ -129,7 +129,7 @@ message_filename
ALIGN
open_message_file_workspace ENTRY "r1-r3"
open_message_file_workspace Entry "r1-r3"
MOV r6, r0 ; Save message token
LDR r2, [r12] ; Got workspace yet?
TEQ r2, #0
......
......@@ -51,7 +51,7 @@
GET VersionASM
LEADR Module_LoadAddr
AREA |SpriteUtils$$Code|, CODE, READONLY, PIC
; *************************** Module starts here ******************************
......@@ -102,7 +102,7 @@ SpriteUtils_Title
SpriteUtils_HelpStr
DCB "SpriteUtils"
DCB 9
DCB "$Module_MajorVersion ($Module_Date)", 0
DCB "$Module_HelpVersion", 0
GET s.TokHelpSrc
......@@ -124,7 +124,7 @@ SChoose_Code ROUT
50 ; Common entry point
ENTRY
Entry
MOV r2, r0 ; Pointer to name
MOV r0, r6 ; rc
SWI XOS_SpriteOp
......@@ -207,7 +207,7 @@ SRename_Code ROUT
50 ; Common entry point
ENTRY
Entry
BL TwoNamePtrs
MOV r0, r6
SWI XOS_SpriteOp
......@@ -223,7 +223,7 @@ SCopy_Code ; NOROUT
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
SDelete_Code ENTRY
SDelete_Code Entry
MOV R2,R0 ;Pointer to name
......@@ -251,7 +251,7 @@ SDelete_Cod40 ;String terminator found
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
SInfo_Code ENTRY
SInfo_Code Entry
MOV r0, #SpriteReason_ReadAreaCB
SWI XOS_SpriteOp
BVC SInfo_Cod10
......@@ -370,6 +370,6 @@ TwoNam20 ;R3 points at first space
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
GET s.MsgCode
GET MsgCode.s
END
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment