diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-08-20 09:43:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 09:43:59 -0400 |
| commit | 7258ef4ddebd021208a019f6ee73edcda57a88f7 (patch) | |
| tree | 30cccf48c8f03e59e48a2d265e05494238fe758d /source/slang/slang-check.cpp | |
| parent | 3e78e4654cdf9556869325f2ed2da517f252d879 (diff) | |
User defined downstream compiler prelude (#1028)
* Added setDownstreamCompilerPrelude
Renamed setPassThroughPath to setDownstreamCompilerPath.
Fixed tests.
Added prelude directory & code to TestToolUtil to setup default preludes for testing/command line apis.
* Fix merge problem
* Remove hacks to make prelude work by adding a search path as no longer needed with 'user prelude'.
* Split up prelude into scalar intrinsics, and types.
Use slang.h for main header.
slang-cpp-prelude.h can now just include what it needs (relative to prelude directory) and define the few remaining things/work arounds.
* Fix typo.
Diffstat (limited to 'source/slang/slang-check.cpp')
| -rw-r--r-- | source/slang/slang-check.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/slang/slang-check.cpp b/source/slang/slang-check.cpp index 464dafcd9..33fc10e45 100644 --- a/source/slang/slang-check.cpp +++ b/source/slang/slang-check.cpp @@ -364,9 +364,9 @@ namespace Slang StringBuilder builder; PassThroughMode passThrough = _toPassThroughMode(type); - if (passThrough != PassThroughMode::None && m_passThroughPaths[int(passThrough)].getLength() > 0) + if (passThrough != PassThroughMode::None && m_downstreamCompilerPaths[int(passThrough)].getLength() > 0) { - Path::combineIntoBuilder(m_passThroughPaths[int(passThrough)].getUnownedSlice(), UnownedStringSlice(libName), builder); + Path::combineIntoBuilder(m_downstreamCompilerPaths[int(passThrough)].getUnownedSlice(), UnownedStringSlice(libName), builder); libName = builder.getBuffer(); } @@ -424,9 +424,9 @@ namespace Slang typedef CPPCompiler::CompilerType CompilerType; CPPCompilerUtil::InitializeSetDesc desc; - desc.paths[int(CompilerType::GCC)] = m_passThroughPaths[int(PassThroughMode::Gcc)]; - desc.paths[int(CompilerType::Clang)] = m_passThroughPaths[int(PassThroughMode::Clang)]; - desc.paths[int(CompilerType::VisualStudio)] = m_passThroughPaths[int(PassThroughMode::VisualStudio)]; + desc.paths[int(CompilerType::GCC)] = m_downstreamCompilerPaths[int(PassThroughMode::Gcc)]; + desc.paths[int(CompilerType::Clang)] = m_downstreamCompilerPaths[int(PassThroughMode::Clang)]; + desc.paths[int(CompilerType::VisualStudio)] = m_downstreamCompilerPaths[int(PassThroughMode::VisualStudio)]; CPPCompilerUtil::initializeSet(desc, cppCompilerSet); } |
