diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang-compiler.cpp | 6 | ||||
| -rw-r--r-- | source/slang/slang-options.cpp | 5 | ||||
| -rw-r--r-- | source/slang/slang.cpp | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp index 789103ff8..edcb6e2d4 100644 --- a/source/slang/slang-compiler.cpp +++ b/source/slang/slang-compiler.cpp @@ -1285,12 +1285,8 @@ void printDiagnosticArg(StringBuilder& sb, CodeGenTarget val) if (_isCPUHostTarget(target)) { options.libraryPaths.add(Path::getParentDirectory(Path::getExecutablePath())); - // Set up the library artifact - const ArtifactDesc desc = ArtifactDesc::make(ArtifactKind::Library, Artifact::Payload::HostCPU, ArtifactStyle::Unknown); - RefPtr<Artifact> artifact = new Artifact(desc); - artifact->setPath(Artifact::PathType::Existing, "slang-rt"); - + RefPtr<Artifact> artifact = new Artifact(ArtifactDesc::make(ArtifactKind::Library, Artifact::Payload::HostCPU), "slang-rt"); options.libraries.add(artifact); } } diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index 4c7234753..b02c25549 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -1422,8 +1422,11 @@ struct OptionsParser return SLANG_FAIL; } + const String name = Artifact::getBaseNameFromPath(desc, referenceModuleName.value.getUnownedSlice()); + // Create the artifact - RefPtr<Artifact> artifact = new Artifact(desc); + RefPtr<Artifact> artifact = new Artifact(desc, name); + // Set the path artifact->setPath(Artifact::PathType::Existing, referenceModuleName.value); diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 5b65cd15a..83c52c660 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -4361,8 +4361,10 @@ SlangResult EndToEndCompileRequest::addLibraryReference(const void* libData, siz RefPtr<ModuleLibrary> library; SLANG_RETURN_ON_FAIL(loadModuleLibrary((const Byte*)libData, libDataSize, this, library)); - const auto desc = ArtifactDesc::make(ArtifactKind::Library, ArtifactPayload::SlangIR, ArtifactStyle::Unknown); - RefPtr<Artifact> artifact = new Artifact(desc); + const auto desc = ArtifactDesc::make(ArtifactKind::Library, ArtifactPayload::SlangIR); + + // Create an artifact without any name (as one is not provided) + RefPtr<Artifact> artifact = new Artifact(desc, String()); artifact->add(Artifact::Entry::Style::Artifact, library); |