Cross-compilable

Detail:
* Rewrite Makefile to use shared makefiles
* Enable GitLab CI


Version 0.09. Not tagged

.gitlab-ci.yml

+include:
+  - project: 'Support/CI'
+    file: '/RedrawMgr.yml'

Makefile

@@ -15,118 +15,14 @@
 # Makefile for RedrawMgr
 #
 
-#
-# Paths
-#
-EXP_HDR = <export$dir>
-
-#
-# Generic options:
-#
-MKDIR   = do mkdir -p
-AS      = objasm
-CC      = cc
-CMHG    = cmhg
-CP      = copy
-LD      = link
-RM      = remove
-WIPE    = x wipe
-
-AFLAGS = -depend !Depend -Stamp -quit
-CFLAGS  = -c -depend !Depend -zM -zps1 -ff ${INCLUDES} ${DFLAGS}
-CPFLAGS = ~cfr~v
-WFLAGS  = ~c~v
-
-#
-# Libraries
-#
-CLIB      = CLIB:o.stubs
-RLIB      = RISCOSLIB:o.risc_oslib
-RSTUBS    = RISCOSLIB:o.rstubs
-ROMSTUBS  = RISCOSLIB:o.romstubs
-ROMCSTUBS = RISCOSLIB:o.romcstubs
-ABSSYM    = RISC_OSLib:o.AbsSym
-
-#
-# Include files
-#
-INCLUDES = -IC:tboxlibs,C:
-
-LIBS     = C:tboxlibs.o.wimplib
-
-DFLAGS   = -DDONT_RMENSURE
-
-#
-# Program specific options:
-#
 COMPONENT = RedrawMgr
-TARGET    = aof.RedrawMgr
-OBJS      = o.main o.veneers o.Modhdr o.errors
-EXPORTS   = 
-
-#
-# Rule patterns
-#
-.c.o:;      ${CC} ${CFLAGS} -o $@ $<
-.cmhg.o:;   ${CMHG} -p -o $@ $<
-.s.o:;      ${AS} ${AFLAGS} $< $@
-
-#
-# build a relocatable module:
-#
-all: rm.RedrawMgr
-
-#
-# RISC OS ROM build rules:
-#
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
-
-export: ${EXPORTS}
-	@echo ${COMPONENT}: export complete
-
-install: rm.RedrawMgr
-	${MKDIR} ${INSTDIR}
-	${CP} rm.RedrawMgr ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: ram module installed
-
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-clean:
-	${WIPE} o.* ${WFLAGS}
-	${WIPE} rm.* ${WFLAGS}
-	${WIPE} linked.* ${WFLAGS}
-	${WIPE} map.* ${WFLAGS}
-	${RM} ${TARGET}
-	@echo ${COMPONENT}: cleaned
-
-resources:
-#        ${MKDIR} ${RESDIR}.RedrawMgr
-#        ${CP} Resources.${LOCALE}.Messages  ${RESDIR}.RedrawMgr.Messages  ${CPFLAGS}
-#        @echo ${COMPONENT}: resource files copied
-
-#
-# ROM target (re-linked at ROM Image build time)
-#
-${TARGET}: ${OBJS} ${ROMCSTUBS}
-	${LD} -o $@ -aof ${OBJS} ${LIBS} ${ROMCSTUBS}
-
-#
-# Final link for the ROM Image (using given base address)
-#
-rom_link:
-	${MKDIR} linked
-	${MKDIR} map
-	${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${TARGET} ${ABSSYM}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
-
-rm.RedrawMgr: ${OBJS} ${CLIB}
-	${LD} -o $@ -module ${OBJS} ${LIBS} ${CLIB}
-
-${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}
-#       ${CP} hdr.${COMPONENT} $@ ${CPFLAGS}
+HDRS      =
+CUSTOMRES = no
+CDEFINES  = -DDONT_RMENSURE
+OBJS      = main veneers errors
+CMHGFILE  = Modhdr
+LIBS      = ${WIMPLIB}
+
+include CModule
 
 # Dynamic dependencies:

MkRam,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine all
+amu_machine standalone

VersionASM

 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.1.
 ;
                         GBLS    Module_MajorVersion
                         GBLA    Module_Version
@@ -10,14 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-                        GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "0.09"
 Module_Version          SETA    9
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "14 Jan 2012"
-Module_ApplicationDate  SETS    "14-Jan-12"
+Module_Date             SETS    "08 Sep 2021"
+Module_ApplicationDate  SETS    "08-Sep-21"
 Module_ComponentName    SETS    "RedrawMgr"
-Module_ComponentPath    SETS    "castle/RiscOS/Sources/Desktop/RedrawMgr"
 Module_FullVersion      SETS    "0.09"
-Module_HelpVersion      SETS    "0.09 (14 Jan 2012)"
+Module_HelpVersion      SETS    "0.09 (08 Sep 2021)"
                         END

VersionNum

 /* (0.09)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.1.
  *
  */
 #define Module_MajorVersion_CMHG        0.09
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                14 Jan 2012
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG                08 Sep 2021
 
 #define Module_MajorVersion             "0.09"
 #define Module_Version                  9
 #define Module_MinorVersion             ""
-#define Module_Date                     "14 Jan 2012"
+#define Module_Date                     "08 Sep 2021"
 
-#define Module_ApplicationDate          "14-Jan-12"
+#define Module_ApplicationDate          "08-Sep-21"
 
 #define Module_ComponentName            "RedrawMgr"
-#define Module_ComponentPath            "castle/RiscOS/Sources/Desktop/RedrawMgr"
 
 #define Module_FullVersion              "0.09"
-#define Module_HelpVersion              "0.09 (14 Jan 2012)"
+#define Module_HelpVersion              "0.09 (08 Sep 2021)"
 #define Module_LibraryVersionInfo       "0:9"

c/main

@@ -31,11 +31,11 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "tbox:h.wimp"
+#include "tboxlibs/wimp.h"
 #ifndef DONT_RMENSURE
 #include "rmensure.h"
 #endif
-#include "tbox:h.wimplib"
+#include "tboxlibs/wimplib.h"
 
 #define IGNORE(a) a=a