diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/compiler-core/slang-glslang-compiler.cpp | 5 | ||||
| -rw-r--r-- | source/core/slang-platform.cpp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/compiler-core/slang-glslang-compiler.cpp b/source/compiler-core/slang-glslang-compiler.cpp index e893ef0ea..fc8beaa48 100644 --- a/source/compiler-core/slang-glslang-compiler.cpp +++ b/source/compiler-core/slang-glslang-compiler.cpp @@ -260,6 +260,11 @@ SlangResult GlslangDownstreamCompiler::disassemble(SlangCompileTarget sourceBlob // isn't going to be distributed with the shader compiler. ComPtr<ISlangSharedLibrary> pthreadLibrary; DefaultSharedLibraryLoader::load(loader, path, "pthread", pthreadLibrary.writeRef()); + if (!pthreadLibrary.get()) + { + DefaultSharedLibraryLoader::load(loader, path, "libpthread.so.0", pthreadLibrary.writeRef()); + } + #endif SLANG_RETURN_ON_FAIL(DownstreamCompilerUtil::loadSharedLibrary(path, loader, nullptr, "slang-glslang", library)); diff --git a/source/core/slang-platform.cpp b/source/core/slang-platform.cpp index e46851095..5185d5d23 100644 --- a/source/core/slang-platform.cpp +++ b/source/core/slang-platform.cpp @@ -209,9 +209,11 @@ SLANG_COMPILE_TIME_ASSERT(E_OUTOFMEMORY == SLANG_E_OUT_OF_MEMORY); dst.Append(name); dst.Append(".dylib"); #elif SLANG_LINUX_FAMILY - dst.Append("lib"); + if (!name.startsWith("lib")) + dst.Append("lib"); dst.Append(name); - dst.Append(".so"); + if (name.indexOf(UnownedStringSlice(".so.")) == -1) + dst.Append(".so"); #else // Just guess we can do with the name on it's own dst.Append(name); |