diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-07-19 11:52:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 11:52:59 -0700 |
| commit | 019bc0d1507afcc6b12f3dd097040d664d9c1d50 (patch) | |
| tree | 71022a3689bedfffe0ee3d969daffb2ae42fc720 /source/slang/compiler.cpp | |
| parent | c5ed9e8d6bc1668d6075b42b17d65a97c168c98b (diff) | |
| parent | a97eac202cec673a0f2e27e808cfdcdd29289c4e (diff) | |
Merge pull request #126 from tfoleyNV/dynamic-library-build
Build a dynamic library for Slang
Diffstat (limited to 'source/slang/compiler.cpp')
| -rw-r--r-- | source/slang/compiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/slang/compiler.cpp b/source/slang/compiler.cpp index 96fccced1..85e78e85b 100644 --- a/source/slang/compiler.cpp +++ b/source/slang/compiler.cpp @@ -14,7 +14,7 @@ #include "emit.h" // Utilities for pass-through modes -#include "../../tools/glslang/glslang.h" +#include "../slang-glslang/slang-glslang.h" #ifdef _WIN32 @@ -354,7 +354,7 @@ namespace Slang HMODULE getGLSLCompilerDLL() { // TODO(tfoley): let user specify version of glslang DLL to use. - static HMODULE glslCompiler = LoadLibraryA("glslang"); + static HMODULE glslCompiler = LoadLibraryA("slang-glslang"); // TODO(tfoley): handle case where we can't find it gracefully assert(glslCompiler); return glslCompiler; |