Skip to content

GitLab

Source
...
Target
Commits (1)
  • Robert Sprowson's avatar
    Build fix · 5b285072
    Robert Sprowson authored 
    Don't set RES_OBJ to an empty string.
Make use of INSTRES_FILES to simplify the resources phase.

Version 1.49. Tagged as 'BootCmds-1_49'
    5b285072
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 32 deletions
Makefile
View file @ 5b285072
......@@ -22,39 +22,20 @@ CDEFINES += -DTRACE=0
OBJS = main
LIBS += ${OSLIB} ${CONLIB}
HDRS =
RES_OBJ =
CUSTOMRES = custom
RES_AREA = files_messages
RAMCDEFINES += -DSTANDALONE=1
INSTRES_FILES = aif.Repeat
INSTRES_DEPENDS = aif.Repeat
ifeq ("${CMDHELP}","None")
CMHGDEFINES += -DNO_INTERNATIONAL_HELP
SA_OBJS = ${OBJS} msgs
else
SA_OBJS = ${OBJS} msgscmd
endif
include CModule
#
# Resources need both the messages and the 'Repeat' binary
#
resources: resources-${CMDHELP} aif.Repeat
${CP} aif.Repeat ${RESFSDIR}.Repeat ${CPFLAGS}
@${ECHO} ${COMPONENT}: resources copied to Messages module
#
# Static dependencies
#
o.msgscmd: ${DIRS} LocalRes:Messages LocalRes:CmdHelp aif.Repeat
${MKDIR} ${MERGEDMDIR}
FAppend ${MERGEDMSGS} LocalRes:Messages LocalRes:CmdHelp
${RESGEN} files_messages $@ ${MERGEDMSGS} Resources.${TARGET}.Messages \
aif.Repeat Resources.${TARGET}.Repeat
o.msgs: ${DIRS} LocalRes:Messages aif.Repeat
${RESGEN} files_messages $@ LocalRes:Messages Resources.${TARGET}.Messages \
aif.Repeat Resources.${TARGET}.Repeat
aif.Repeat: ${DIRS} repeatcmd.c
${CC} ${CINCLUDES} -o $@ repeatcmd.c ${CLIB} ${OSLIB}
......
VersionNum
View file @ 5b285072
/* (1.48)
/* (1.49)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.48
#define Module_MajorVersion_CMHG 1.49
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Apr 2014
#define Module_Date_CMHG 02 Aug 2015
#define Module_MajorVersion "1.48"
#define Module_Version 148
#define Module_MajorVersion "1.49"
#define Module_Version 149
#define Module_MinorVersion ""
#define Module_Date "06 Apr 2014"
#define Module_Date "02 Aug 2015"
#define Module_ApplicationDate "06-Apr-14"
#define Module_ApplicationDate "02-Aug-15"
#define Module_ComponentName "BootCmds"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/BootCmds"
#define Module_FullVersion "1.48"
#define Module_HelpVersion "1.48 (06 Apr 2014)"
#define Module_LibraryVersionInfo "1:48"
#define Module_FullVersion "1.49"
#define Module_HelpVersion "1.49 (02 Aug 2015)"
#define Module_LibraryVersionInfo "1:49"