From c84e7c0fa526de51f380227a6667f723af36aea2 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 25 Apr 2019 08:51:12 -0400 Subject: Fixed building on CygWin with clang gcc (#953) * * Make Path:: use lowerCamel method names as per coding standard * Small improvements to make closer to standard * GetDirectoryName -> getParentDirectory - previous method name's action was somewhat unclear, hopefully this is better * * Can build on clang and gcc on CygWin * Fix problem on cygwin loading shared libraries * Renamed Path::isRelative to ::hasRelativeElement because isRelative implies the path is 'relative to the current path' and which isn't quite what it does * Documented how to build for CygWin * * Fix small bug creating platform shared library name. * Small typo fixes in building.md --- source/slang/slang-file-system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/slang') diff --git a/source/slang/slang-file-system.cpp b/source/slang/slang-file-system.cpp index 2583a7562..58cda679d 100644 --- a/source/slang/slang-file-system.cpp +++ b/source/slang/slang-file-system.cpp @@ -249,7 +249,7 @@ SlangResult CacheFileSystem::_calcUniqueIdentity(const String& path, String& out { outUniqueIdentity = Path::simplify(path); // If it still has relative elements can't uniquely identify, so give up - return Path::isRelative(outUniqueIdentity) ? SLANG_FAIL : SLANG_OK; + return Path::hasRelativeElement(outUniqueIdentity) ? SLANG_FAIL : SLANG_OK; } case UniqueIdentityMode::SimplifyPathAndHash: case UniqueIdentityMode::Hash: -- cgit v1.2.3