mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-14 13:51:04 +00:00
Merge pull request #1882 from Kangz/fix-chrome
GN build (for Chromium): enable HLSL in dependents.
This commit is contained in:
commit
32d18c552b
15
BUILD.gn
15
BUILD.gn
@ -37,6 +37,8 @@ spirv_tools_dir = glslang_spirv_tools_dir
|
||||
|
||||
config("glslang_public") {
|
||||
include_dirs = [ "." ]
|
||||
|
||||
defines = [ "ENABLE_HLSL=1" ]
|
||||
}
|
||||
|
||||
source_set("glslang_sources") {
|
||||
@ -131,10 +133,7 @@ source_set("glslang_sources") {
|
||||
"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 @@ source_set("glslang_sources") {
|
||||
}
|
||||
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 @@ source_set("glslang_default_resource_limits_sources") {
|
||||
"StandAlone/ResourceLimits.cpp",
|
||||
"StandAlone/ResourceLimits.h",
|
||||
]
|
||||
deps = [ ":glslang_sources" ]
|
||||
deps = [
|
||||
":glslang_sources",
|
||||
]
|
||||
public_configs = [ ":glslang_public" ]
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user