Commit cb1c7449 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Change less useful resources_messages for resources_sprites

GNU/AAsmModule:
 Swap round ${RESOURCEEXTRA} to come later, since otherwise the ${RESDIR} hasn't been created
AAsmModule & CModule:
 Recemtly added resources_messages was a bit pointless as resources_common did the same thing, instead add resources_sprites.
ModuleLibs:
 Debug library for internal Toolbox objects added.
Retagged as BuildSys-6_50.
parent a4135210
......@@ -268,7 +268,7 @@ ${C_EXP_HDR}.${CHEADER3}.h :: ${CHEADER3}.h
#
# Resources rules
#
resources${CUSTOMRES}:: resources-${CMDHELP} ${RESOURCEEXTRA}
resources${CUSTOMRES}:: ${RESOURCEEXTRA} resources-${CMDHELP}
@${ECHO} ${COMPONENT}: resources copied to Messages module
ifeq (${CUSTOMRES},no)
......@@ -289,8 +289,8 @@ resources-: ${MERGEDMSGS}
resources_res::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Res
resources_messages::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Messages
resources_sprites::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Sprites [Sprites11] [Sprites22]
resources_templates::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Templates
......
......@@ -289,8 +289,8 @@ resources-: resources_common
resources_res::
${CP} LocalRes:Res ${RESFSDIR}.Res ${CPFLAGS}
resources_messages::
${CP} LocalRes:Messages ${RESFSDIR}.Messages ${CPFLAGS}
resources_sprites::
${INSTRES} -I LocalUserIFRes:,LocalRes:,Resources ${RESFSDIR} Sprites [Sprites11] [Sprites22]
resources_templates::
${CP} LocalRes:Templates ${RESFSDIR}.Templates ${CPFLAGS}
......
......@@ -62,7 +62,7 @@ INCLUDED_CMODULE = YES
# ROM_OBJS (opt) (ROM build objects - otherwise ${OBJS})
# SA_OBJS (opt) (standalone build objects - otherwise ${OBJS})
# DBG_OBJS (opt) (debug build object files, no prefixes - otherwise ${OBJS})
# LIBS (opt) (extra libraries; CLib is always used)
# LIBS (opt) (extra libraries; ${CLIB} is always used)
# ROM_LIBS (opt) (libraries to link for ROM targets - otherwise ${LIBS})
# SA_LIBS (opt) (libraries to link for standalone targets - otherwise ${LIBS})
# DBG_LIBS (opt) (extra debug libraries in addition to SA_LIBS and DEBUGLIBS)
......@@ -314,13 +314,13 @@ resources-None: resources_common
resources-: resources_common
IfThere LocalRes:CmdHelp Then ${TOKENCHECK} LocalRes:CmdHelp
IfThere LocalRes:CmdHelp Then FAppend ${RESFSDIR}.Messages LocalRes:Messages LocalRes:CmdHelp
IfThere LocalRes:CmdHelp Then ${FAPPEND} ${RESFSDIR}.Messages LocalRes:Messages LocalRes:CmdHelp
resources_res::
${CP} LocalRes:Res ${RESFSDIR}.Res ${CPFLAGS}
resources_messages::
${CP} LocalRes:Messages ${RESFSDIR}.Messages ${CPFLAGS}
resources_sprites::
${INSTRES} -I LocalUserIFRes:,LocalRes:,Resources ${RESFSDIR} Sprites [Sprites11] [Sprites22]
resources_templates::
${CP} LocalRes:Templates ${RESFSDIR}.Templates ${CPFLAGS}
......
......@@ -41,6 +41,7 @@ WIMPLIB = C:tboxlibs.o.wimplib
RENDERLIB = C:tboxlibs.o.renderlib
TBOXLIBS = ${EVENTLIB} ${TBOXLIB} ${RENDERLIB} ${WIMPLIB}
TBOXINTLIB= C:tboxlibint.o.tboxlibm
TBOXINTDBGLIB = C:tboxlibint.o.debuglibm
SOCK4LIB = TCPIPLibs:o.socklibzm
SOCK5LIB = TCPIPLibs:o.socklib5zm
......
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