summaryrefslogtreecommitdiffstats
path: root/source/slang/compiler.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-07-19 11:27:23 -0700
committerTim Foley <tfoley@nvidia.com>2017-07-19 11:27:23 -0700
commita97eac202cec673a0f2e27e808cfdcdd29289c4e (patch)
tree71022a3689bedfffe0ee3d969daffb2ae42fc720 /source/slang/compiler.cpp
parentc5ed9e8d6bc1668d6075b42b17d65a97c168c98b (diff)
Build a dynamic library for Slang
- Change the `slang` project from a static library to a dynamic one - Add some details around `slang.h` to make sure DLL export stuff is working - Make the `slangc` executable use the dynamic library - Rename the `glslang` sub-project to `slang-glslang` and move it into the main source hierarchy - This reflects the fact that it isn't a stand-alone tool, and isn't in any way a standard binary of glslang, but rather just an artifact of how Slang uses glslang
Diffstat (limited to 'source/slang/compiler.cpp')
-rw-r--r--source/slang/compiler.cpp4
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;