From 60c80e5709865e2e4675a23563898e9d9f3fac67 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Wed, 12 May 2021 21:44:18 +0100
Subject: [PATCH] Define cross-platform specifiers for 7 additional library
includes
---
GNUmakefiles/LibIncludes | 7 +++++++
Makefiles/LibIncludes | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/GNUmakefiles/LibIncludes b/GNUmakefiles/LibIncludes
index 55e3ba5..ea44cdc 100644
--- a/GNUmakefiles/LibIncludes
+++ b/GNUmakefiles/LibIncludes
@@ -9,10 +9,17 @@ INCLUDED_LIBINCLUDES = YES
# 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
diff --git a/Makefiles/LibIncludes b/Makefiles/LibIncludes
index 379ed81..796c5ff 100644
--- a/Makefiles/LibIncludes
+++ b/Makefiles/LibIncludes
@@ -9,10 +9,17 @@ INCLUDED_LIBINCLUDES = YES
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
+IMAGEINC = -IC:ImageLib
+JSINC = -IC:JSLib
OSINC = -IOS:
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
+MBEDTLSINC = -IC:mbedTLS
+NSPRINC = -IC:NSPRLib
+RINC = -IRISCOSLIB:
TBOXINC = -Itbox:
TCPIPINC = -ITCPIPLibs:
+USBINC = -IC:USB
+ZINC = -IC:zlib
# EOF
--
GitLab