Skip to content

G
glslang
Unverified Commit 517f39ee by John Kessenich Committed by GitHub
Options

Merge pull request #2380 from null77/suppress-override-warnings

Suppress two override suggestion warnings.
parents 983698bb bb52b5e4
Showing with 10 additions and 8 deletions
BUILD.gn
...@@ -59,13 +59,13 @@ action("glslang_build_info") { ...@@ -59,13 +59,13 @@ action("glslang_build_info") {
script, script,
template_file, template_file,
] ]
outputs = [ outputs = [ out_file ]
out_file
]
args = [ args = [
rebase_path(src_dir, root_build_dir), rebase_path(src_dir, root_build_dir),
"-i", rebase_path(template_file, root_build_dir), "-i",
"-o", rebase_path(out_file, root_build_dir), rebase_path(template_file, root_build_dir),
"-o",
rebase_path(out_file, root_build_dir),
] ]
} }
...@@ -228,10 +228,12 @@ template("glslang_sources_common") { ...@@ -228,10 +228,12 @@ template("glslang_sources_common") {
"-Wno-ignored-qualifiers", "-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough", "-Wno-implicit-fallthrough",
"-Wno-inconsistent-missing-override", "-Wno-inconsistent-missing-override",
"-Wno-sign-compare",
"-Wno-unused-variable",
"-Wno-missing-field-initializers", "-Wno-missing-field-initializers",
"-Wno-newline-eof", "-Wno-newline-eof",
"-Wno-sign-compare",
"-Wno-suggest-destructor-override",
"-Wno-suggest-override",
"-Wno-unused-variable",
] ]
} }
if (is_win && !is_clang) { if (is_win && !is_clang) {
...@@ -291,9 +293,9 @@ executable("glslang_validator") { ...@@ -291,9 +293,9 @@ executable("glslang_validator") {
} }
defines = [ "ENABLE_OPT=1" ] defines = [ "ENABLE_OPT=1" ]
deps = [ deps = [
":glslang_build_info",
":glslang_default_resource_limits_sources", ":glslang_default_resource_limits_sources",
":glslang_sources", ":glslang_sources",
":glslang_build_info",
] ]
public_configs = [ ":glslang_hlsl" ] public_configs = [ ":glslang_hlsl" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment