Commit 5a8e41dc authored by Ben Avison's avatar Ben Avison
Browse files

Updates to library include path defines

* Define cross-platform name for ConfigLib header include path.
* Define cross-platform name for tboxlibint header include path.
* Undefine `${TCPIPINC}` when building with GCC (as with the standard C
  headers, the headers in TCPIPLibs conflict with those on the default
  include path when compiling with GCC. Our TCPIPLibs headers appear to be
  incompatible with GCC, so resolve the conflict by removing TCPIPLibs from
  the path).
parent 907fd86a
......@@ -9,6 +9,7 @@ INCLUDED_LIBINCLUDES = YES
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
CONINC = -I${LIBDIR}/ConfigLib
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
......@@ -16,7 +17,10 @@ MBEDTLSINC = -I${LIBDIR}/mbedTLS
NSPRINC = -I${LIBDIR}/NSPRLib
RINC = -I${LIBDIR}/RISC_OSLib
TBOXINC = -I${LIBDIR}/tboxlibs
TBOXINTINC = -I${LIBDIR}/tboxlibint
ifneq (GNU,${TOOLCHAIN})
TCPIPINC = -I${LIBDIR}/TCPIPLibs
endif
USBINC = -I${LIBDIR}/USB
ZINC = -I${LIBDIR}/zlib
......
......@@ -9,6 +9,7 @@ INCLUDED_LIBINCLUDES = YES
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
CONINC = -IC:ConfigLib
IMAGEINC = -IC:ImageLib
JSINC = -IC:JSLib
OSINC = -IOS:
......@@ -16,6 +17,7 @@ MBEDTLSINC = -IC:mbedTLS
NSPRINC = -IC:NSPRLib
RINC = -IRISCOSLIB:
TBOXINC = -Itbox:
TBOXINTINC = -IC:tboxlibint
TCPIPINC = -ITCPIPLibs:
USBINC = -IC:USB
ZINC = -IC:zlib
......
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