Commit 53b25b7a authored by Ben Avison's avatar Ben Avison

Makefile bugfixes

Detail:
  Makefiles/AAsmModule:
  * This was the odd-one out amongst top-level shared makefiles in that it
    still required the master makefile to include StdTools explicitly - even
    the GNU version of this makefile did so. Now changed for consistency.
  GNUmakefiles/AAsmModule:
  * Fixed typo in renaming of MERGEDMDIR to MERGEDRDIR.
Admin:
  Fixes build error in latest FPEmulator


Version 7.25. Tagged as 'BuildSys-7_25'
parent 5e83cb7e
......@@ -230,7 +230,7 @@ ${MERGEDMSGS}:
${TOUCH} ${MERGEDRDIR}/tmp/Messages
${TOUCH} ${MERGEDRDIR}/tmp/CmdHelp
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${MERGEDRDIR} [Messages] [CmdHelp]
${CAT} ${MERGEDRDIR}/tmp/Messages ${MERGEDMRDIR}/tmp/CmdHelp > $@
${CAT} ${MERGEDRDIR}/tmp/Messages ${MERGEDRDIR}/tmp/CmdHelp > $@
${WIPE} ${MERGEDRDIR}/tmp
else
${MERGEDMSGS}::
......
......@@ -156,6 +156,11 @@ CHEADER2 ?= _!_x_!_
CHEADER3 ?= _!_x_!_
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
all: rom debug standalone
${DIRS} ::
......
/* (7.24)
/* (7.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 7.24
#define Module_MajorVersion_CMHG 7.25
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Apr 2018
#define Module_Date_CMHG 14 Apr 2018
#define Module_MajorVersion "7.24"
#define Module_Version 724
#define Module_MajorVersion "7.25"
#define Module_Version 725
#define Module_MinorVersion ""
#define Module_Date "12 Apr 2018"
#define Module_Date "14 Apr 2018"
#define Module_ApplicationDate "12-Apr-18"
#define Module_ApplicationDate "14-Apr-18"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "7.24"
#define Module_HelpVersion "7.24 (12 Apr 2018)"
#define Module_LibraryVersionInfo "7:24"
#define Module_FullVersion "7.25"
#define Module_HelpVersion "7.25 (14 Apr 2018)"
#define Module_LibraryVersionInfo "7:25"
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