Source
...
Target
Commits (32)
......@@ -25,6 +25,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -103,6 +103,7 @@ DebugLib -type EXP
Connector -options INSTDIR=<Install$Dir>.BonusBin.Utilities
GateWay -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Econet
MailMan -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Econet
NetMonitor -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Econet
FontEd -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Developer
MakeModes -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Developer
WinEdit -options INSTDIR=<Install$Dir>.BonusBin.Utilities.Developer
......@@ -111,6 +112,9 @@ ResEd -options INSTDIR=<Install$Dir>.BonusBin.Apps.DDE
ResTest -options INSTDIR=<Install$Dir>.BonusBin.Apps.DDE
ResCreate -options INSTDIR=<Install$Dir>.BonusBin.Apps.DDE
SrcEdit -options INSTDIR=<Install$Dir>.BonusBin.Apps.DDE
Player -options INSTDIR=<Install$Dir>.BonusBin.Apps
SamplePlayer -options INSTDIR=<Install$Dir>.BonusBin.Apps.!Player
MIDIPlayer -options INSTDIR=<Install$Dir>.BonusBin.Apps.!Player
#
# Bonus modules
......
......@@ -203,6 +203,8 @@ Window -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.
# Targets - Utilities
#
Allocate -options INSTDIR=Install:DDE.Utilities
CreateSEC -options INSTDIR=Install:DDE.Utilities
SDCreate -options INSTDIR=Install:DDE.Utilities
#
# Targets - Tools/Tools
......
......@@ -128,6 +128,8 @@ PRISMLib -type EXP # Lib.PRISMLib
#
ConfigLib -type EXP # Lib.Configure
Dialler -type EXP # Networking.Modem.Dialler
ImageLibPNG -type EXP # Lib.ImageLib
ImageLib -type EXP # Lib.ImageLib
KeyWatch -type EXP # Programmer.KeyWatch
RMVersion -type EXP # Programmer.RMVersion
SoundControl -type EXP # Audio.SoundCtrl
......@@ -186,6 +188,7 @@ PPP -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
RouteD -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules.Network CMDHELP=None
AcornHTTP -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules.Network.URL
AcornSSL -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.350.Modules.Network.URL
CompressPNG -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.350.Modules
URL -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules.Network.URL
ScreenFX -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.360.Modules.Video
SharedCLibrary -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.500.Modules
......
......@@ -24,6 +24,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......@@ -38,7 +39,7 @@ VFPSupport -type EXP
# Kernel is first module in ROM seen as the UtilityModule
HAL_IOMD
Kernel -at 0xFC010000
Kernel -at 0xFC008000
Podule
FileSwitch
ResourceFS
......
......@@ -25,6 +25,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -24,6 +24,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -27,6 +27,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -24,6 +24,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -24,6 +24,7 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
......
......@@ -25,7 +25,8 @@ HdrSrc -type EXP
# we need the following exported for swis.h generation
# change the type to EXP
#
#DDEUtils -type EXP
CompressPNG -type EXP
DDEUtils -type EXP
Econet -type EXP
DDT -type EXP
HostFS -type EXP
......@@ -196,7 +197,6 @@ InetRes -options TYPE=EmergencyUtils
EtherTH
AHCIDriver
GPIO -type EXP
DDEUtils
# some libraries and bits
#
......
......@@ -43,6 +43,9 @@ INCLUDED_AASMMODULE = YES
# INSTRES_VERSION (opt) (if set to "Messages", automatically insert version into Messages file during resources phase)
# MERGEDMSGS (r/o) (leafname of generated Messages file)
# RESFSDIR (opt) (actual directory to export resources to - otherwise ${RESDIR}/${TARGET})
# TOKHELPSRC (opt) (set equal to ${TOKENSOURCE} to indicate that the binary depends on autogenerated tokenised help source file of that name)
# HELPSRC (opt) (set to filename containing untokenised help messages if ${TOKHELPSRC} = ${TOKENSOURCE})
# TOKENS (opt) (set to filename containing help message tokens - otherwise ${HDRDIR}/Global/Tokens)
# CUSTOMEXP (opt) (set to "custom" to override the export rules)
# CUSTOMRES (opt) (set to "custom" to override the resources rules, or "no" for no resources)
# CUSTOMROM (opt) (set to "custom" to override the rom rules)
......@@ -124,6 +127,10 @@ endif
SOURCES_TO_SYMLINK += $(wildcard h/*) $(wildcard hdr/*) $(wildcard s/*) Resources VersionNum VersionASM
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
ifneq (objs,$(notdir ${CURDIR}))
# Makefile invoked from same directory
......@@ -144,16 +151,16 @@ clean::
@echo ${COMPONENT}: cleaned
else
ifneq (,${SYMLINK_EXT_FIRST})
SYMLINK_SED_PATTERN = 's,^\([^/]*\)/\(.*\),\2.\1,'
SYMLINK_SED_PATTERN = 's,^\([^/]\+\)/\(.\+\),\2.\1,'
else
SYMLINK_SED_PATTERN = 's,\([^/]*\)/\([^/]*\)$$,\2.\1,'
SYMLINK_SED_PATTERN = 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,'
endif
all debug export export_hdrs export_libs gpa_debug install install_rom rom_link links resources rom standalone: ${SYMLINK_DEPEND}
$(foreach linksource,${SOURCES_TO_SYMLINK}, \
$(shell \
linkdest=`echo ${linksource} | sed -e ${SYMLINK_SED_PATTERN} -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
) \
......@@ -169,10 +176,6 @@ else
# Makefile invoked from objs subdirectory
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
all: rom debug standalone
# GNU make seems to treat any double-colon rule with no dependencies as
......@@ -237,7 +240,7 @@ ${MERGEDMSGS}:
${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} [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 > $@
${WIPE} ${MERGEDRDIR}/tmp
else
......
......@@ -39,8 +39,9 @@ SOCK4LIB = ${LIBDIR}/TCPIPLibs/socklib.a
SOCK5LIB = ${LIBDIR}/TCPIPLibs/socklib5.a
INETLIB = ${LIBDIR}/TCPIPLibs/inetlib.a
UNIXLIB = ${LIBDIR}/TCPIPLibs/unixlib.a
RPCLIB = ${LIBDIR}/TCPIPLibs/rpc/rpc_data.a ${LIBDIR}/TCPIPLibs/rpc/rpclib.a
RPCLIB = ${LIBDIR}/TCPIPLibs/rpc/rpc_data.o ${LIBDIR}/TCPIPLibs/rpc/rpclib.a
CRYPTLIB = ${LIBDIR}/SSLeay/ssl.a ${LIBDIR}/SSLeay/libcrypto.a
MBEDTLSLIB = ${LIBDIR}/mbedTLS/mbedTLS.a
NET4LIBS = ${UNIXLIB} ${INETLIB} ${SOCK4LIB}
NET5LIBS = ${UNIXLIB} ${INETLIB} ${SOCK5LIB}
......@@ -71,8 +72,8 @@ ZLIB = ${LIBDIR}/zlib/zlib.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLib.a
DEBUGLIBS = # ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
INCLUDE_OSLIB = -I${LIBDIR}/OSLib/Core,${LIBDIR}/OSLib/Computer,${LIBDIR}/OSLib/User,${LIBDIR}/OSLib/Toolbox,{LIBDIR}/OSLib/Core/oslib,${LIBDIR}/OSLib/Computer/oslib,${LIBDIR}/OSLib/User/oslib,${LIBDIR}/OSLib/Toolbox/oslib
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
......@@ -111,6 +111,12 @@ ROM_OBJS_ = $(addsuffix .oz,${ROM_OBJS})
SOURCES_TO_SYMLINK += $(wildcard c/*) $(wildcard c++/*) $(wildcard h/*) $(wildcard s/*) VersionNum VersionASM
ifeq ("${INCLUDED_STDTOOLS}","")
ifeq ("${INCLUDED_HOSTTOOLS}","")
include StdTools
endif
endif
ifneq (objs,$(notdir ${CURDIR}))
# Makefile invoked from same directory
......@@ -133,9 +139,9 @@ else
all install debug resources rom rom_link links: ${SYMLINK_DEPEND}
$(foreach linksource,${SOURCES_TO_SYMLINK}, \
$(shell \
linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
) \
......@@ -151,12 +157,6 @@ else
# Makefile invoked from objs subdirectory
ifeq ("${INCLUDED_STDTOOLS}","")
ifeq ("${INCLUDED_HOSTTOOLS}","")
include StdTools
endif
endif
ifeq ($(filter rom%,${MAKECMDGOALS}),)
ifeq ("${INCLUDED_APPLIBS}","")
include AppLibs
......@@ -274,4 +274,10 @@ include $(wildcard *.dd)
endif
export${CUSTOMEXP}: export_${PHASE}
@${NOP}
export_ export_hdrs export_libs:
@${NOP}
# EOF
......@@ -25,6 +25,7 @@ INCLUDED_CLIBRARY = YES
# DIRS (opt) (stamp object for directory creation - otherwise _dirs)
# HDRS (opt) (header files to export, no h. prefix - otherwise ${TARGET})
# ASMHDRS (opt) (assembly header files to export, no Hdr. prefix - otherwise none)
# EXPORTS (opt) (dependencies for export_hdrs phase - otherwise deduced from ${HDRS} and ${ASMHDRS})
# OBJS (object files, no o. or oz. prefixes)
# DBG_OBJS (opt) (debug build object files, no o. or oz. prefixes - otherwise ${OBJS})
# APP_OBJS (opt) (release application object files, no o. or oz. prefixes - otherwise ${OBJS})
......@@ -96,6 +97,7 @@ MOD_DBG_OBJS_ = $(addsuffix .odz,${MOD_DBG_OBJS})
EXPORTING_HDRS = $(addsuffix .exphdr,${HDRS})
EXPORTING_ASMHDRS = $(addsuffix .expasm,${ASMHDRS})
EXPORTS ?= ${EXPORTING_HDRS} ${EXPORTING_ASMHDRS}
EXPORTING_LIBS = $(addsuffix .explib,${LIBRARIES})
TARGET_LIBS = $(addsuffix .${LIBEXT},${LIBRARIES})
......@@ -107,6 +109,10 @@ endif
SOURCES_TO_SYMLINK += $(wildcard c/*) $(wildcard h/*) $(wildcard s/*)
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
ifneq (objs,$(notdir ${CURDIR}))
# Makefile invoked from same directory
......@@ -126,12 +132,12 @@ clean::
@rm -rf objs
@echo ${COMPONENT}: cleaned
else
all_libs export_hdrs export_libs links: ${SYMLINK_DEPEND}
all_libs export export_hdrs export_libs links: ${SYMLINK_DEPEND}
$(foreach linksource,${SOURCES_TO_SYMLINK}, \
$(shell \
linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
) \
......@@ -146,10 +152,6 @@ else
# Makefile invoked from objs subdirectory
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
ifeq ("${INCLUDED_STDRULES}","")
include StdRules
endif
......@@ -185,7 +187,7 @@ create_exp_lib_dir:
.Hdr.expasm:; ${CP} $< ${EXPDIR}/$* ${CPFLAGS}
.${LIBEXT}.explib:; ${CP} $< ${EXPDIR}/$< ${CPFLAGS}
export_hdrs: create_exp_hdr_dirs ${DIRS} ${EXPORTING_ASMHDRS} ${EXPORTING_HDRS}
export_hdrs: create_exp_hdr_dirs ${DIRS} ${EXPORTS}
[ ! -f ../VersionNum ] || ${CP} ../VersionNum ${EXPDIR}/LibVersion ${CPFLAGS}
@${ECHO} ${COMPONENT}: header export complete
......
......@@ -56,6 +56,10 @@ INCLUDED_CMODULE = YES
# DBG_LIBS (opt) (extra debug libraries in addition to SA_LIBS and DEBUGLIBS)
# ROM_DEPEND (opt) (any extra dependency to assert on ROM_TARGET)
# SA_DEPEND (opt) (any extra dependency to assert on SA_TARGET and DBG_TARGET)
# TOKHELPDEPENDS (opt) (set to any source files which need to include any autogenerated tokenised help file - otherwise ${OBJS})
# TOKHELPSRC (opt) (set equal to ${TOKENSOURCE} to indicate that the binary depends on autogenerated tokenised help source file of that name)
# HELPSRC (opt) (set to filename containing untokenised help messages if ${TOKHELPSRC} = ${TOKENSOURCE})
# TOKENS (opt) (set to filename containing help message tokens - otherwise ${HDRDIR}/Global/Tokens)
# CUSTOMEXP (opt) (set to "custom" to override the export rules)
# CUSTOMRES (opt) (set to "custom" to override the resources rules, or "no" for no resources)
# CUSTOMROM (opt) (set to "custom" to override the rom rules)
......@@ -144,7 +148,7 @@ INSTRAM_DEPENDS ?= ${INSTRES_DEPENDS}
INSTROM_FILES ?= ${INSTRES_FILES}
INSTROM_DEPENDS ?= ${INSTRES_DEPENDS}
MERGEDRDIR ?= _ResData_
MERGEDMSGS ?= ${MERGEDRDIR}/${TARGET}/Messages
MERGEDMSGS ?= ${MERGEDRDIR}/${TARGET}/MergedMessages
RES_AREA ?= Resources
RES_OBJ ?= ${TARGET}Msgs
RES_PATH ?= Resources
......@@ -162,10 +166,11 @@ ROM_OBJS += ${CMHGFILE}
SA_OBJS += ${CMHGFILE}
DBG_OBJS += ${CMHGFILE}
ifeq ($(filter no custom,${CUSTOMRES}),)
RESDIR ?= ${MERGEDRDIR} # Place to internally collect up contents of RES_OBJ
RESDIR ?= ${MERGEDRDIR}
SA_OBJS += ${RES_OBJ}
DBG_OBJS += ${RES_OBJ}
endif
TOKHELPDEPENDS ?= ${OBJS}
ROM_LIBS ?= ${LIBS}
SA_LIBS ?= ${LIBS}
ROM_LIBS += ${ROMCSTUBS}
......@@ -197,8 +202,16 @@ ifneq ($(filter debug%,${MAKECMDGOALS}),)
CMHGFLAGS += ${CMHGDFLAGS} # Affects both object and header generation
endif
TOKENS ?= ${HDRDIR}/Global/Tokens
# Unlike with AAsmModule, we enforce this filename, to prevent any cross-compilation issues being introduced
TOKENSOURCE := TokHelpSrc.s
SOURCES_TO_SYMLINK += $(wildcard c/*) $(wildcard c++/*) $(wildcard cmhg/*) $(wildcard h/*) $(wildcard hdr/*) $(wildcard s/*) VersionNum VersionASM
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
ifneq (objs,$(notdir ${CURDIR}))
# Makefile invoked from same directory
......@@ -221,9 +234,9 @@ else
all export export_hdrs export_libs resources rom rom_link standalone install debug gpa_debug prepro links: ${SYMLINK_DEPEND}
$(foreach linksource,${SOURCES_TO_SYMLINK}, \
$(shell \
linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
) \
......@@ -245,9 +258,6 @@ ifneq ("${ASM2TXT_EXT}","")
ASM2TXT_EXT := .${ASM2TXT_EXT}
endif
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
ifeq ("${INCLUDED_MODULELIBS}","")
include ModuleLibs
endif
......@@ -314,6 +324,14 @@ CMHGDEPENDS_ = $(addsuffix .o,${CMHGDEPENDS}) $(addsuffix .od,${CMHGDEPENDS}) $(
${CMHGDEPENDS_}: ${CMHGFILE}.h
endif
ifeq (${TOKHELPSRC},${TOKENSOURCE})
TOKHELPDEPENDS_ = $(addsuffix .o,${TOKHELPDEPENDS}) $(addsuffix .od,${TOKHELPDEPENDS})
${TOKHELPDEPENDS_}: ${TOKHELPSRC}
endif
${TOKENSOURCE}: ${HELPSRC} ${TOKENS}
${TOKENISE} ${TOKENS} ${HELPSRC} $@
ifeq ("${MODULEWRAP}","yes")
modulewrap.s: ${LIBDIR}/RISC_OSLib/modulewrap.s
${CP} $^ $@
......@@ -358,7 +376,7 @@ resources_common:
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} [Messages]
resources_cmdhelp: ${MERGEDMSGS}
${CP} ${MERGEDMSGS} ${RESFSDIR}/Messages
mv ${MERGEDMSGS} ${RESFSDIR}/Messages
resources-None: resources_common resources_extra
@${NOP}
......@@ -373,6 +391,20 @@ ${RES_OBJ}.o: ${DIRS} resources-${CMDHELP}
${RES_OBJ}.od: ${RES_OBJ}.o
${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
#
......
......@@ -18,10 +18,10 @@ endif
# C source files -> object files
.c.od:
${CC} $(filter-out ${C_NO_FNAMES},${CFLAGS}) ${CDFLAGS} -o $@ $<
${CC} $(filter-out ${C_NO_FNAMES},${CFLAGS}) ${CDFLAGS} ${CAPPFLAGS} -o $@ $<
$(call make-depend,$<,$@,$(subst .od,.dd,$@))
.c.odz:
${CC} $(filter-out ${C_NO_FNAMES},${CFLAGS}) ${CDFLAGS} ${C_MODULE} -o $@ $<
${CC} $(filter-out ${C_NO_FNAMES},${CFLAGS}) ${CDFLAGS} ${CMODFLAGS} ${C_MODULE} -o $@ $<
$(call make-depend,$<,$@,$(subst .odz,.ddz,$@))
.c.i:
${CPREPRO} ${CFLAGS} -C $< > $@
......
# Makefile fragment for library header search paths
INCLUDED_LIBINCLUDES = YES
# Library include paths, for where there's a historical precedent for the
# subdirectory to be omitted. These definitions are equally valid for
# application and module components, even though they typically require
# different library binaries at the link step. They are also useful for
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
IMAGEINC = -I${LIBDIR}/ImageLib
JSINC = -I${LIBDIR}/JSLib
OSINC = -I${LIBDIR}/OSLib/Core -I${LIBDIR}/OSLib/Computer -I${LIBDIR}/OSLib/User -I${LIBDIR}/OSLib/Toolbox -I${LIBDIR}/OSLib/Core/oslib -I${LIBDIR}/OSLib/Computer/oslib -I${LIBDIR}/OSLib/User/oslib -I${LIBDIR}/OSLib/Toolbox/oslib
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
MBEDTLSINC = -I${LIBDIR}/mbedTLS
NSPRINC = -I${LIBDIR}/NSPRLib
RINC = -I${LIBDIR}/RISC_OSLib
TBOXINC = -I${LIBDIR}/tboxlibs
TCPIPINC = -I${LIBDIR}/TCPIPLibs
USBINC = -I${LIBDIR}/USB
ZINC = -I${LIBDIR}/zlib
# EOF
......@@ -16,7 +16,7 @@ ABSSYM = ${LIBDIR}/RISC_OSLib/abssym.a
C_ABSSYM = ${LIBDIR}/RISC_OSLib/c_abssym.a
A_ABSSYM = ${LIBDIR}/RISC_OSLib/a_abssym.a
ASMUTILS = ${LIBDIR}/AsmUtils/AsmUtilsZM.a
ASMUTILS = ${LIBDIR}/AsmUtils/AsmUtilszm.a
ifeq (GNU,${TOOLCHAIN})
C++LIB =
else
......@@ -37,8 +37,9 @@ SOCK4LIB = ${LIBDIR}/TCPIPLibs/socklibzm.a
SOCK5LIB = ${LIBDIR}/TCPIPLibs/socklib5zm.a
INETLIB = ${LIBDIR}/TCPIPLibs/inetlibzm.a
UNIXLIB = ${LIBDIR}/TCPIPLibs/unixlibzm.a
RPCLIB = ${LIBDIR}/TCPIPLibs/rpc/rpc_datazm.a ${LIBDIR}/TCPIPLibs/rpc/rpclibzm.a
RPCLIB = ${LIBDIR}/TCPIPLibs/rpc/rpc_datazm.o ${LIBDIR}/TCPIPLibs/rpc/rpclibzm.a
CRYPTLIB = ${LIBDIR}/SSLeay/ssl.a ${LIBDIR}/SSLeay/libcrypto.a
MBEDTLSLIB = ${LIBDIR}/mbedTLS/mbedTLSzm.a
NET4LIBS = ${UNIXLIB} ${INETLIB} ${SOCK4LIB}
NET5LIBS = ${UNIXLIB} ${INETLIB} ${SOCK5LIB}
......@@ -69,8 +70,8 @@ ZLIB = ${LIBDIR}/zlib/zlibzm.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLibZM.a
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
INCLUDE_OSLIB = -I${LIBDIR}/OSLib/Core,${LIBDIR}/OSLib/Computer,${LIBDIR}/OSLib/User,${LIBDIR}/OSLib/Toolbox,{LIBDIR}/OSLib/Core/oslib,${LIBDIR}/OSLib/Computer/oslib,${LIBDIR}/OSLib/User/oslib,${LIBDIR}/OSLib/Toolbox/oslib
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
......@@ -2,9 +2,9 @@
INCLUDED_STDRULES = YES
# $(call make-depend,source,object,depend)
# $(call make-depend,source,object,depend,flags)
define make-depend
@${CC} ${CFLAGS} -M $1 > $3 2> /dev/null
@${CC} ${CFLAGS} $4 -M $1 > $3 2> /dev/null
@${SED} -i -e 's,$(basename $2).o *:,$2:,' $3
endef
......@@ -23,11 +23,11 @@ endif
# C source files -> object files
.c.o:
${CC} ${CFLAGS} -o $@ $<
$(call make-depend,$<,$@,$(subst .o,.d,$@))
${CC} ${CFLAGS} ${CAPPFLAGS} -o $@ $<
$(call make-depend,$<,$@,$(subst .o,.d,$@),${CAPPFLAGS})
.c.oz:
${CC} ${CFLAGS} ${C_MODULE} -o $@ $<
$(call make-depend,$<,$@,$(subst .oz,.dz,$@))
${CC} ${CFLAGS} ${CMODFLAGS} ${C_MODULE} -o $@ $<
$(call make-depend,$<,$@,$(subst .oz,.dz,$@),${CMODFLAGS})
# C++ source files -> object files
.c++.o:
......