Commit ba010d65 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.71 or later.
  Requires BuildSys 3.06 or later.
  Requires Env 0.65 or later.

Version 0.36. Tagged as 'Free-0_36'
parent f4f8609b
......@@ -19,60 +19,14 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 14-Mar-01 SNB Recreated.
#
#
# Paths
#
EXP_HDR = <export$dir>
#
# Generic options:
#
MKDIR = cdir
AS = aasm
CP = copy
RM = remove
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module
CPFLAGS = ~cfr~v
#
# Program specific options:
#
COMPONENT = Free
SOURCE = s.Free
TARGET = rm.Free
EXPORTS = ${EXP_HDR}.Free
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
@echo ${COMPONENT}: cleaned
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
resources:
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} Resources.${LOCALE}.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
@echo ${COMPONENT}: resource files copied
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} -To $@ -From ${SOURCE}
HEADER1 = Free
RESOURCEEXTRA = resources_templates
${EXP_HDR}.Free: hdr.Free
${CP} hdr.Free $@ ${CPFLAGS}
include StdTools
include AAsmModule
# Dynamic dependencies:
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
......@@ -8,11 +8,17 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "0.35"
Module_Version SETA 35
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.36"
Module_Version SETA 36
Module_MinorVersion SETS ""
Module_Date SETS "10 Jul 2000"
Module_ApplicationDate2 SETS "10-Jul-00"
Module_ApplicationDate4 SETS "10-Jul-2000"
Module_FullVersion SETS "0.35"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "Free"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Free"
Module_FullVersion SETS "0.36"
Module_HelpVersion SETS "0.36 (16 Mar 2001)"
END
/* (0.35)
/* (0.36)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.35
#define Module_MajorVersion_CMHG 0.36
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Jul 2000
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "0.35"
#define Module_Version 35
#define Module_MajorVersion "0.36"
#define Module_Version 36
#define Module_MinorVersion ""
#define Module_Date "10 Jul 2000"
#define Module_Date "16 Mar 2001"
#define Module_ApplicationDate2 "10-Jul-00"
#define Module_ApplicationDate4 "10-Jul-2000"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_FullVersion "0.35"
#define Module_ComponentName "Free"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Free"
#define Module_FullVersion "0.36"
#define Module_HelpVersion "0.36 (16 Mar 2001)"
......@@ -49,6 +49,8 @@
;; Wish list
;;-----------------------------------------------------------------------------
AREA |Free$$Code|, CODE, READONLY, PIC
Module_BaseAddr
GET Hdr:ListOpts
......@@ -86,16 +88,16 @@ Module_BaseAddr
GET VersionASM
GBLA Version
Version SETA Module_Version
[ :LNOT: :DEF: standalone
GBLL standalone
standalone SETL {FALSE}
]
GBLL debugxx
GBLL debugmsg ; Message lookup.
GBLL hostvdu
debug SETL false
debugxx SETL false ; General tracing.
debugmsg SETL false
hostvdu SETL true
......@@ -193,5 +195,5 @@ icon_FreeBar * 6
icon_Used * 1
icon_UsedBar * 4
; ----------------------------------------------------------------------------------------------------------------------
LNK s.ModHead
LNK ModHead.s
......@@ -13,7 +13,6 @@
; limitations under the License.
;
; > s.ModHead
LEADR Module_LoadAddr
ASSERT (.=Module_BaseAddr)
MySWIBase * Module_SWISystemBase + FreeSWI * Module_SWIChunkSize
......@@ -39,11 +38,7 @@ MySWIBase * Module_SWISystemBase + FreeSWI * Module_SWIChunkSize
]
; ----------------------------------------------------------------------------------------------------------------------
Helpstr DCB "Free",9,9,"$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
DCB 0
Helpstr DCB "Free",9,9,"$Module_HelpVersion", 0
Title ;DCB "Free",0
Free_SWInames
......@@ -230,7 +225,7 @@ create_window ; Window not found, create new window bl
; Module initialisation point
Init Entry
[ debugmsg
[ standalone
ADR r0, resourcefiles
SWI XResourceFS_RegisterFiles ; ignore errors
]
......@@ -321,7 +316,7 @@ ServiceTable
DCD Service_StartWimp
DCD Service_StartedWimp
DCD Service_MemoryMoved
[ debugmsg
[ standalone
DCD Service_ResourceFSStarting
]
DCD 0
......@@ -332,7 +327,7 @@ Service
TEQNE r1, #Service_StartedWimp
TEQNE r1, #Service_Reset
TEQNE r1, #Service_MemoryMoved
[ debugmsg
[ standalone
TEQNE r1, #Service_ResourceFSStarting
]
MOVNE pc, lr
......@@ -353,7 +348,7 @@ ServiceUrsula
TEQ R1,#Service_MemoryMoved
BEQ svc_memorymoved
[ debugmsg
[ standalone
TEQ R1,#Service_ResourceFSStarting
BEQ svc_resourcefsstarting
]
......@@ -394,10 +389,6 @@ svc_reset Entry "r0-r3"
ADR r2, windows_ptr
BL free_list ; Free buffered list
[ Version < 4 ; Don't forget about Filing systems we know.
ADR r2, fs_list
BL free_list ; Free buffered list
]
MOV r0, #0 ; Clear task handle
STR r0, mytaskhandle
......@@ -409,7 +400,7 @@ svc_reset Entry "r0-r3"
EXIT
[ debugmsg
[ standalone
; ----------------------------------------------------------------------------------------------------------------------
; ResourceFS is restarting - we need to re-register our resource files
......@@ -482,7 +473,7 @@ Die Entry "r7-r11"
TEQ r0, #0
SWINE XMessageTrans_CloseFile
[ debugmsg
[ standalone
; Deregister ResourceFS files
ADR r0, resourcefiles
SWI XResourceFS_DeregisterFiles
......@@ -609,10 +600,10 @@ UpCall_handler ROUT
; ----------------------------------------------------------------------------------------------------------------------
[ debugmsg
[ standalone
resourcefiles
ResourceFile Templates.Templates, Resources.Free.Templates
ResourceFile Messages, Resources.Free.Messages
ResourceFile LocalRes:Templates, Resources.Free.Templates
ResourceFile $MergedMsgs, Resources.Free.Messages
DCD 0
]
......
......@@ -321,7 +321,7 @@ updatelp1
STR r0,[r5,#size_ascii]
]
[ Version >= 2 ; Centre window on mouse pointer
; Centre window on mouse pointer
ADR r1,dataarea
ADR r2,windowarea
SWI XWimp_GetPointerInfo
......@@ -344,7 +344,6 @@ updatelp1
STR r3,[r2,#w_way0]
STR r4,[r2,#w_way1]
]
ADR r1,windowarea
SWI XWimp_CreateWindow ; Create the window
Pull "PC",VS
......@@ -956,4 +955,4 @@ RemoveEntry ROUT
STRVS r0,[sp]
Pull "r0-r6,PC"
LNK s.Messages
LNK Messages.s
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