mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-09 20:10:06 +00:00
Merge pull request #2380 from null77/suppress-override-warnings
Suppress two override suggestion warnings.
This commit is contained in:
commit
517f39eee4
18
BUILD.gn
18
BUILD.gn
@ -59,13 +59,13 @@ action("glslang_build_info") {
|
||||
script,
|
||||
template_file,
|
||||
]
|
||||
outputs = [
|
||||
out_file
|
||||
]
|
||||
outputs = [ out_file ]
|
||||
args = [
|
||||
rebase_path(src_dir, root_build_dir),
|
||||
"-i", rebase_path(template_file, root_build_dir),
|
||||
"-o", rebase_path(out_file, root_build_dir),
|
||||
"-i",
|
||||
rebase_path(template_file, root_build_dir),
|
||||
"-o",
|
||||
rebase_path(out_file, root_build_dir),
|
||||
]
|
||||
}
|
||||
|
||||
@ -228,10 +228,12 @@ template("glslang_sources_common") {
|
||||
"-Wno-ignored-qualifiers",
|
||||
"-Wno-implicit-fallthrough",
|
||||
"-Wno-inconsistent-missing-override",
|
||||
"-Wno-sign-compare",
|
||||
"-Wno-unused-variable",
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Wno-newline-eof",
|
||||
"-Wno-sign-compare",
|
||||
"-Wno-suggest-destructor-override",
|
||||
"-Wno-suggest-override",
|
||||
"-Wno-unused-variable",
|
||||
]
|
||||
}
|
||||
if (is_win && !is_clang) {
|
||||
@ -291,9 +293,9 @@ executable("glslang_validator") {
|
||||
}
|
||||
defines = [ "ENABLE_OPT=1" ]
|
||||
deps = [
|
||||
":glslang_build_info",
|
||||
":glslang_default_resource_limits_sources",
|
||||
":glslang_sources",
|
||||
":glslang_build_info",
|
||||
]
|
||||
public_configs = [ ":glslang_hlsl" ]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user