summaryrefslogtreecommitdiffstats
path: root/premake5.lua
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2021-01-20 09:23:39 -0800
committerGitHub <noreply@github.com>2021-01-20 09:23:39 -0800
commit660cf7a639cb0f73e2ea7abc4a4a8ca59e50c88d (patch)
treef9d01c26370918814edb8e8e58b97699ec7b22ed /premake5.lua
parentc6fd4a5b35911f0f056f6e924a2dbc86e328cc46 (diff)
Update glslang to 11.1.0 (#1662)
* Update glslang to 11.1.0 This change pulls new versions of glslang, spirv-headers, and spirv-tools as submodules, and makes the necessary changes to other files in the repository to get it all building (at least on Windows). This change also enables building of glslang from source by default, so that we can easily generate new binaries for inclusion in the `slang-binaries` repository. * fixup: missing file
Diffstat (limited to 'premake5.lua')
-rw-r--r--premake5.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua
index 211955ae1..3d925ddb8 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -79,7 +79,7 @@ newoption {
trigger = "build-glslang",
description = "(Optional) If true glslang and spirv-opt will be built",
value = "bool",
- default = "false",
+ default = "true",
allowed = { { "true", "True"}, { "false", "False" } }
}
@@ -1311,9 +1311,11 @@ standardProject("slang-glslang", "source/slang-glslang")
-- On Windows we need to add the platform-specific sources and then
-- remove the `main.cpp` file since it tries to define a `DllMain`
-- and we don't want the default glslang one.
+ addSourceDir( "external/glslang/glslang/OSDependent/Windows")
removefiles { "external/glslang/glslang/OSDependent/Windows/main.cpp" }
filter { "system:linux or macosx" }
+ addSourceDir( "external/glslang/glslang/OSDependent/Unix")
links { "dl" }