Commit d6ee8ba0 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Simplify debug and CUSTOMSA use

AppLibs/ModuleLibs:
DebugLib requires remotedb to link, and both are present, but remotedb requires InetLib and SockLib. Currently client makefiles must specify this, but can't do via DBG_LIBS because of the ordering, so end up having to mess around with LIBS in a conditional.
Simplify this by providing the libraries in DEBUGLIBS.

CModule:
Add a new SA_TARGET_RULE variable so that when CUSTOMSA is in use it is still possible to invoke the standalone build without needing to know about the differences between GNU and native makefiles (one uses 'MyModule,ffa' the other 'rm.MyModule').
This will allow the 5 uses of CModule to be simplified in future, the 5 uses of AAsmModule for CUSTOMSA are just to stop a module being output.
parent f33c9046
......@@ -70,7 +70,7 @@ WILDLIB = ${LIBDIR}/Wild/Wild.a
ZLIB = ${LIBDIR}/zlib/zlib.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLib.a
DEBUGLIBS = # ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${INETLIB} ${SOCK5LIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
......
......@@ -133,6 +133,7 @@ TARGET ?= ${COMPONENT}
ROM_TARGET ?= ${TARGET}
LNK_TARGET ?= ${TARGET}
SA_TARGET ?= ${TARGET}
SA_TARGET_RULE= ${SA_TARGET}${SUFFIX_MODULE}
DBG_TARGET ?= ${TARGET}D
AIF_TARGET ?= ${TARGET}
GPA_TARGET ?= ${TARGET}
......
......@@ -68,7 +68,7 @@ WILDLIB = ${LIBDIR}/Wild/Wildzm.a
ZLIB = ${LIBDIR}/zlib/zlibzm.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLibZM.a
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${INETLIB} ${SOCK5LIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
......
......@@ -78,7 +78,7 @@ WILDLIB = C:Wild.o.Wild
ZLIB = C:zlib.o.zlib
DEBUGLIB = C:DebugLib.o.DebugLib
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${INETLIB} ${SOCK5LIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
......
......@@ -154,6 +154,7 @@ TARGET ?= ${COMPONENT}
ROM_TARGET ?= ${TARGET}
LNK_TARGET ?= ${TARGET}
SA_TARGET ?= ${TARGET}
SA_TARGET_RULE= rm.${SA_TARGET}
DBG_TARGET ?= ${TARGET}D
AIF_TARGET ?= ${TARGET}
GPA_TARGET ?= ${TARGET}
......
......@@ -78,7 +78,7 @@ WILDLIB = C:Wild.o.Wildzm
ZLIB = C:zlib.o.zlibzm
DEBUGLIB = C:DebugLib.o.DebugLibZM
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${INETLIB} ${SOCK5LIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
......
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