Commit 74e31eed 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 4.64. Tagged as 'Wimp-4_64'
parent 443e5637
......@@ -29,72 +29,38 @@
# 03-Aug-99 BJGA No longer produces build errors if some resources are absent
#
#
# Paths
#
EXP_HDR = <export$dir>
#
# Generic options:
#
MKDIR = cdir
AS = objasm
LD = link
CP = copy
RM = remove
WIPE = -wipe
ASFLAGS = -NOWarn -depend !Depend ${THROWBACK} ${OPTS} -cpu 3 -o $@
LDFLAGS = -rmf -o $@
CPFLAGS = ~cfr~v
WFLAGS = ~cfr~v
#
# Program specific options:
#
COMPONENT = Wimp
SOURCE = s.Wimp
OBJECT = o.Wimp
TARGET = rm.Wimp
OPTS = -PreDefine "Options SETS \"${OPTIONS}\""
EXPORTS = ${EXP_HDR}.Wimp \
${EXP_HDR}.WimpSpace
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
COMPONENT = WindowManager
TARGET = Wimp
HEADER1 = ${TARGET}
HEADER2 = WimpSpace
RESOURCES = manual
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
ASFLAGS = -cpu 3 -NoWarn -PreDefine "Options SETS \"${OPTIONS}\""
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
include StdTools
include AAsmModule
clean:
${RM} ${TARGET}
${WIPE} o ${WFLAGS}
@echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP}
resources: resources-wimp-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS} Else IfThere LocalRes:Messages Then ${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Templates Then ${CP} LocalRes:<UserIF>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites Then ${CP} LocalRes:<UserIF>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites22 Then ${CP} LocalRes:<UserIF>.Sprites22 ${RESDIR}.${COMPONENT}.Sprites22 ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileN Then ${CP} LocalRes:<UserIF>.TileN ${RESDIR}.${COMPONENT}.TileN ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileV Then ${CP} LocalRes:<UserIF>.TileV ${RESDIR}.${COMPONENT}.TileV ${CPFLAGS}
IfThere LocalRes:<UserIF>.Tools Then ${CP} LocalRes:<UserIF>.Tools ${RESDIR}.${COMPONENT}.Tools ${CPFLAGS}
resources-wimp_common:
${MKDIR} ${RESFSDIR}
IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESFSDIR}.Messages ${CPFLAGS} Else IfThere LocalRes:Messages Then ${CP} LocalRes:Messages ${RESFSDIR}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Templates Then ${CP} LocalRes:<UserIF>.Templates ${RESFSDIR}.Templates ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites Then ${CP} LocalRes:<UserIF>.Sprites ${RESFSDIR}.Sprites ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites22 Then ${CP} LocalRes:<UserIF>.Sprites22 ${RESFSDIR}.Sprites22 ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileN Then ${CP} LocalRes:<UserIF>.TileN ${RESFSDIR}.TileN ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileV Then ${CP} LocalRes:<UserIF>.TileV ${RESFSDIR}.TileV ${CPFLAGS}
IfThere LocalRes:<UserIF>.Tools Then ${CP} LocalRes:<UserIF>.Tools ${RESFSDIR}.Tools ${CPFLAGS}
resources-None: resources_common
@
resources-wimp-None: resources-wimp_common
@|
resources-: resources_common
IfThere LocalRes:CmdHelp Then Print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
resources-wimp-: resources-wimp_common
@IfThere LocalRes:CmdHelp Then ${CAT} LocalRes:CmdHelp { >> ${RESFSDIR}.Messages }
BBETYPE = wimp
bbe-wimp: bbe-generic-resources-get-alias
......@@ -102,18 +68,4 @@ bbe-wimp: bbe-generic-resources-get-alias
BBE_Export_File_In_Dir Resources.${LOCALE} CmdHelp
BBE_Export_Dir Resources.${LOCALE}.${USERIF}
${OBJECT}: ${SOURCE}
${MKDIR} o
${AS} ${ASFLAGS} ${SOURCE}
${TARGET}: ${OBJECT}
${LD} ${LDFLAGS} ${OBJECT}
Access $@ rw/r
${EXP_HDR}.Wimp: hdr.Wimp
${CP} hdr.Wimp $@ ${CPFLAGS}
${EXP_HDR}.WimpSpace: hdr.WimpSpace
${CP} hdr.WimpSpace $@ ${CPFLAGS}
# Dynamic dependencies:
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
......@@ -13,4 +13,5 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine export
amu_machine export PHASE=hdrs
amu_machine export PHASE=libs
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine rom %*0
amu_machine rom THROWBACK=-throwback %*0
......@@ -39,9 +39,11 @@
;------------------------------------------------------------------------------
[ :LNOT: :DEF: standalone
Option standalone, false ; include messages / templates
]
Option DoubleIcon, false ; allow double-clicking on icon bar
Option standalone, false ; include messages / templates
Option fastborders, :LNOT:TrueIcon3 ; use PutSpriteAtUserCoords for border plotting
Option colourmoreborder, false :LAND: TrueIcon3 ; colour all tools except scroll wells
Option fixrmatools, false
......
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "4.63"
Module_Version SETA 463
Module_MajorVersion SETS "4.64"
Module_Version SETA 464
Module_MinorVersion SETS ""
Module_Date SETS "15 Mar 2001"
Module_ApplicationDate2 SETS "15-Mar-01"
Module_ApplicationDate4 SETS "15-Mar-2001"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "4.63"
Module_HelpVersion SETS "4.63 (15 Mar 2001)"
Module_FullVersion SETS "4.64"
Module_HelpVersion SETS "4.64 (16 Mar 2001)"
END
/* (4.63)
/* (4.64)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 4.63
#define Module_MajorVersion_CMHG 4.64
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Mar 2001
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "4.63"
#define Module_Version 463
#define Module_MajorVersion "4.64"
#define Module_Version 464
#define Module_MinorVersion ""
#define Module_Date "15 Mar 2001"
#define Module_Date "16 Mar 2001"
#define Module_ApplicationDate2 "15-Mar-01"
#define Module_ApplicationDate4 "15-Mar-2001"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "4.63"
#define Module_HelpVersion "4.63 (15 Mar 2001)"
#define Module_FullVersion "4.64"
#define Module_HelpVersion "4.64 (16 Mar 2001)"
......@@ -1871,10 +1871,7 @@ MySWIBase * Module_SWISystemBase + WimpSWI * Module_SWIChunkSize
DCD Flags - Module_BaseAddr
Title = "WindowManager",0
Helpstr = "Window Manager",9,"$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
Helpstr = "Window Manager",9,"$Module_HelpVersion"
[ DebugMemory
= " Memory debugging enabled"
]
......
......@@ -2516,7 +2516,7 @@ romsprites
resourcefsfiles
[ standalone:LOR:RegisterMessages
ResourceFile Resources.<Locale>.Messages, Resources.Wimp.Messages
ResourceFile $MergedMsgs, Resources.Wimp.Messages
]
[ standalone:LOR:RegisterTemplates
[ NewErrorSystem
......
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