GN build (for Chromium): enable HLSL in dependents.
The previous fix for this only enabled HLSL internally in glslang which
means that dependent using HLSL, for example shaderc, failed
compilation.
diff --git a/BUILD.gn b/BUILD.gn
index d11810b..aa582df 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,6 +37,8 @@
config("glslang_public") {
include_dirs = [ "." ]
+
+ defines = [ "ENABLE_HLSL=1" ]
}
source_set("glslang_sources") {
@@ -131,10 +133,7 @@
"glslang/Public/ShaderLang.h",
]
- defines = [
- "ENABLE_OPT=1",
- "ENABLE_HLSL=1",
- ]
+ defines = [ "ENABLE_OPT=1" ]
if (is_win) {
sources += [ "glslang/OSDependent/Windows/ossource.cpp" ]
@@ -157,8 +156,8 @@
}
if (is_win && !is_clang) {
cflags = [
- "/wd4018", # signed/unsigned mismatch
- "/wd4189", # local variable is initialized but not referenced
+ "/wd4018", # signed/unsigned mismatch
+ "/wd4189", # local variable is initialized but not referenced
]
}
@@ -173,7 +172,9 @@
"StandAlone/ResourceLimits.cpp",
"StandAlone/ResourceLimits.h",
]
- deps = [ ":glslang_sources" ]
+ deps = [
+ ":glslang_sources",
+ ]
public_configs = [ ":glslang_public" ]
}