Commit f0021c4d authored by Richard Buckley's avatar Richard Buckley
Browse files

Build process improvements :

* Standardised make process in common will all other modules in build.
* Internal and external toolbox libraries and headers exported to
  <Lib$Dir>.tboxlibint and <Lib$Dir>.tboxlibs respectivly.
* Resources now localised.
* Local !MkClean and !MkRom now use amu_machine.
parent 646ade3c
......@@ -60,23 +60,23 @@ ABSSYM = RISC_OSLib:o.AbsSym
#
# Include files
#
INCLUDES = -IC:,TBox:
INCLUDES = -IC:,<Lib$Dir>.tboxlibint.
DFLAGS =
# Program specific options:
#
TBOXLIB = tboxlib
TBOXLIBZM = tboxlibzm
TBOXLIBZM = tboxlibm
DEBUGLIB = debuglib
DEBUGLIBZM = debuglibzm
DEBUGLIBZM = debuglibm
EXPORTS = ${LIBDIR}.tboxlibs
EXPORTS = ${LIBDIR}.tboxlibint
OBJ = o.mem o.messages o.string32 o.rmensure o.objsupport
OBJZM = z.mem z.messages z.string32 z.rmensure z.objsupport
OBJ = o.mem o.messages o.string32 o.rmensure o.objsupport o.slist
OBJZM = z.mem z.messages z.string32 z.rmensure z.objsupport z.slist
DBG_OBJ = o.debug o.slist
DBG_OBJZM = z.debug z.slist
DBG_OBJ = o.debug
DBG_OBJZM = z.debug
#
# Rule patterns
......@@ -113,7 +113,8 @@ clean:
export: export_${PHASE}
export_hdrs: dirs
${CP} objects.* ${EXPORTS}.* ${CPFLAGS}
${CP} objects ${EXPORTS}.objects ${CPFLAGS}
${CP} h.* ${EXPORTS}.h.* ${CPFLAGS}
@echo ${DEBUGLIB} and ${TBOXLIB}: export complete (hdrs)
export_libs: ${TBOXLIB} ${TBOXLIBZM} ${DEBUGLIB} ${DEBUGLIBZM} dirs
......
......@@ -27,7 +27,7 @@
#include "const.h"
#include "macros.h"
#include "toolbox.h"
#include "objects.toolbox.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
......
......@@ -26,8 +26,8 @@
#include "swis.h"
#include "debug.h"
#include "toolbox.h"
#include "window.h"
#include "objects.toolbox.h"
#include "objects.window.h"
#include "mem.h"
#include "objsupport.h"
......
......@@ -21,7 +21,7 @@
#include "kernel.h"
#ifndef __toolbox_h
#include "toolbox.h"
#include "objects.toolbox.h"
#endif
......
......@@ -19,8 +19,8 @@
*/
#include "stddef.h"
#include "toolbox.h"
#include "window.h"
#include "objects.toolbox.h"
#include "objects.window.h"
/* copies named template to a buffer, returns NULL if can't find or no memory */
......
......@@ -23,7 +23,7 @@
# define __wimp_h
#ifndef __toolbox_h
#include "toolbox.h"
#include "objects.toolbox.h"
#endif
#include "kernel.h"
......
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