From e2bc521fa840ceece861088d97b2eb20f383baf4 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Tue, 5 Mar 2019 19:17:24 +0000
Subject: [PATCH] Cross-compilable
Detail:
* Makefile: get directory separator and header extension from shared makefiles
* Escape $ in quoted string
* Enable GitLab CI
Version 1.19. Not tagged
---
.gitignore | 6 ++++++
.gitlab-ci.yml | 3 +++
Makefile | 5 ++---
rm/.gitignore | 2 --
s/SCSIDriver | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 .gitignore
create mode 100644 .gitlab-ci.yml
delete mode 100644 rm/.gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6c232e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/aif/
+/gpa/
+/o/
+/objs/
+/Makefile.d
+/rm/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..4270f99
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,3 @@
+include:
+ - project: 'Support/CI'
+ file: '/SCSIDriver.yml'
diff --git a/Makefile b/Makefile
index 94c43fe..6ac5d10 100644
--- a/Makefile
+++ b/Makefile
@@ -19,15 +19,14 @@ COMPONENT ?= SCSIDriver
HEADER1 = SCSI
HEADER2 = SCSIErr
ASMCHEADER1 = SCSIErr
-EXPORTS = ${C_EXP_HDR}.${ASMCHEADER1}
-ROM_SOURCE = s.${COMPONENT}
+EXPORTS = ${C_EXP_HDR}${SEP}${ASMCHEADER1}${SUFFIX_HEADER}
+ROM_SOURCE = ${COMPONENT}.s
RESOURCES = no
ifeq (${TARGET},SCSISoftWD33C93)
ASFLAGS = -pd "soft SETL {TRUE}"
endif
-include StdTools
include AAsmModule
# Dynamic dependencies:
diff --git a/rm/.gitignore b/rm/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/rm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/s/SCSIDriver b/s/SCSIDriver
index 8eb1070..69f117c 100644
--- a/s/SCSIDriver
+++ b/s/SCSIDriver
@@ -421,7 +421,7 @@ LenTextCapacityUnknown EQU (.-TextCapacityUnknown)
ALIGN
-AliasFrom DCB "Alias$Devices", 0
+AliasFrom DCB "Alias$$Devices", 0
AliasTo DCB "%SCSIDevices"
ALIGN
--
GitLab