Commit 1efa2ad9 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 2.62. Tagged as 'Desktop-2_62'
parent 16faf748
......@@ -19,61 +19,13 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 07-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
#
# Program specific options:
#
COMPONENT = Desktop
SOURCE = s.Desktop
TARGET = rm.Desktop
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
@echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} LocalRes:Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
RESOURCEEXTRA = resources_templates
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
include StdTools
include AAsmModule
# Dynamic dependencies:
......@@ -14,5 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
ifthere Run:stripdepnd then stripdepnd <Obey$Dir>.Makefile
stripdepnd Makefile
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.61"
Module_Version SETA 261
Module_MajorVersion SETS "2.62"
Module_Version SETA 262
Module_MinorVersion SETS ""
Module_Date SETS "01 Mar 2001"
Module_ApplicationDate2 SETS "01-Mar-01"
Module_ApplicationDate4 SETS "01-Mar-2001"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "Desktop"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Desktop"
Module_FullVersion SETS "2.61"
Module_HelpVersion SETS "2.61 (01 Mar 2001)"
Module_FullVersion SETS "2.62"
Module_HelpVersion SETS "2.62 (16 Mar 2001)"
END
/* (2.61)
/* (2.62)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.61
#define Module_MajorVersion_CMHG 2.62
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Mar 2001
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "2.61"
#define Module_Version 261
#define Module_MajorVersion "2.62"
#define Module_Version 262
#define Module_MinorVersion ""
#define Module_Date "01 Mar 2001"
#define Module_Date "16 Mar 2001"
#define Module_ApplicationDate2 "01-Mar-01"
#define Module_ApplicationDate4 "01-Mar-2001"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ComponentName "Desktop"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Desktop"
#define Module_FullVersion "2.61"
#define Module_HelpVersion "2.61 (01 Mar 2001)"
#define Module_FullVersion "2.62"
#define Module_HelpVersion "2.62 (16 Mar 2001)"
......@@ -55,12 +55,12 @@
;NK version, uses template for welcome banner
AREA |Desktop$$Code|, CODE, READONLY, PIC
Module_BaseAddr
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
; GET Hdr:EnvNumbers
GET Hdr:ModHand
GET Hdr:Services
GET Hdr:Machine.<Machine>
......@@ -105,7 +105,6 @@ debugtm SETL true :LAND: debug
hostvdu SETL true
LEADR Module_LoadAddr
TAB * 9
LF * 10
......@@ -163,13 +162,7 @@ Desktop_Title
= "Desktop", 0
Desktop_HelpStr
DCB "Desktop", TAB, TAB, "$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
DCB 0
ALIGN
;
DCB "Desktop", TAB, TAB, "$Module_HelpVersion", 0
ALIGN
Desktop_Flags
......@@ -237,7 +230,7 @@ Desktop_Service * Module_BaseAddr
; Desktop_Code - Start up the desktop
;
Desktop_Code ENTRY
Desktop_Code Entry
MOV R2, R0 ; R2 --> parameter list
ADR R0, execcommand ; cancel exec file (if any)
SWI XOS_CLI
......@@ -1439,6 +1432,7 @@ WelcomeError_NoFont
templatename DCB "Resources:$.Resources.Desktop.Templates",0
backdropname DCB "backdrop",0
desktopname DCB "desktop",0
ALIGN
DisplayNewWelcome
Push "R1-R7,lr"
......
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