Skip to content

GitLab

Commit 614326fc authored by Ben Avison's avatar Ben Avison Committed by ROOL
Browse files

Fix merging of CmdHelp/Messages files when cross-compiling

parent 42cff4d4
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 4 deletions
GNUmakefiles/AAsmModule
View file @ 614326fc
...@@ -237,7 +237,7 @@ ${MERGEDMSGS}: ...@@ -237,7 +237,7 @@ ${MERGEDMSGS}:
${MKDIR} ${MERGEDRDIR}/${TARGET} ${MKDIR} ${MERGEDRDIR}/${TARGET}
${TOUCH} ${MERGEDRDIR}/tmp/Messages ${TOUCH} ${MERGEDRDIR}/tmp/Messages
${TOUCH} ${MERGEDRDIR}/tmp/CmdHelp ${TOUCH} ${MERGEDRDIR}/tmp/CmdHelp
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${MERGEDRDIR} [Messages] [CmdHelp] ${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${MERGEDRDIR}/tmp [Messages] [CmdHelp]
${CAT} ${MERGEDRDIR}/tmp/Messages ${MERGEDRDIR}/tmp/CmdHelp > $@ ${CAT} ${MERGEDRDIR}/tmp/Messages ${MERGEDRDIR}/tmp/CmdHelp > $@
${WIPE} ${MERGEDRDIR}/tmp ${WIPE} ${MERGEDRDIR}/tmp
else else
......
GNUmakefiles/CModule
View file @ 614326fc
...@@ -144,7 +144,7 @@ INSTRAM_DEPENDS ?= ${INSTRES_DEPENDS} ...@@ -144,7 +144,7 @@ INSTRAM_DEPENDS ?= ${INSTRES_DEPENDS}
INSTROM_FILES ?= ${INSTRES_FILES} INSTROM_FILES ?= ${INSTRES_FILES}
INSTROM_DEPENDS ?= ${INSTRES_DEPENDS} INSTROM_DEPENDS ?= ${INSTRES_DEPENDS}
MERGEDRDIR ?= _ResData_ MERGEDRDIR ?= _ResData_
MERGEDMSGS ?= ${MERGEDRDIR}/${TARGET}/Messages MERGEDMSGS ?= ${MERGEDRDIR}/${TARGET}/MergedMessages
RES_AREA ?= Resources RES_AREA ?= Resources
RES_OBJ ?= ${TARGET}Msgs RES_OBJ ?= ${TARGET}Msgs
RES_PATH ?= Resources RES_PATH ?= Resources
...@@ -162,7 +162,7 @@ ROM_OBJS += ${CMHGFILE} ...@@ -162,7 +162,7 @@ ROM_OBJS += ${CMHGFILE}
SA_OBJS += ${CMHGFILE} SA_OBJS += ${CMHGFILE}
DBG_OBJS += ${CMHGFILE} DBG_OBJS += ${CMHGFILE}
ifeq ($(filter no custom,${CUSTOMRES}),) ifeq ($(filter no custom,${CUSTOMRES}),)
RESDIR ?= ${MERGEDRDIR} # Place to internally collect up contents of RES_OBJ RESDIR ?= ${MERGEDRDIR}
SA_OBJS += ${RES_OBJ} SA_OBJS += ${RES_OBJ}
DBG_OBJS += ${RES_OBJ} DBG_OBJS += ${RES_OBJ}
endif endif
...@@ -358,7 +358,7 @@ resources_common: ...@@ -358,7 +358,7 @@ resources_common:
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} [Messages] ${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} [Messages]
resources_cmdhelp: ${MERGEDMSGS} resources_cmdhelp: ${MERGEDMSGS}
${CP} ${MERGEDMSGS} ${RESFSDIR}/Messages mv ${MERGEDMSGS} ${RESFSDIR}/Messages
resources-None: resources_common resources_extra resources-None: resources_common resources_extra
@${NOP} @${NOP}
...@@ -373,6 +373,20 @@ ${RES_OBJ}.o: ${DIRS} resources-${CMDHELP} ...@@ -373,6 +373,20 @@ ${RES_OBJ}.o: ${DIRS} resources-${CMDHELP}
${RES_OBJ}.od: ${RES_OBJ}.o ${RES_OBJ}.od: ${RES_OBJ}.o
${CP} $< $@ ${CP} $< $@
ifeq ($(filter no custom,${CUSTOMRES}),)
${MERGEDMSGS}:
${MKDIR} ${MERGEDRDIR}/tmp
${MKDIR} ${MERGEDRDIR}/${TARGET}
${TOUCH} ${MERGEDRDIR}/tmp/Messages
${TOUCH} ${MERGEDRDIR}/tmp/CmdHelp
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${MERGEDRDIR}/tmp [Messages] [CmdHelp]
${CAT} ${MERGEDRDIR}/tmp/Messages ${MERGEDRDIR}/tmp/CmdHelp > $@
${WIPE} ${MERGEDRDIR}/tmp
else
${MERGEDMSGS}::
@${NOP}
endif
# #
# ROM build rules # ROM build rules
# #
......
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