From e5984e92ff378a86118f1e6428dc325dbde9c409 Mon Sep 17 00:00:00 2001 From: ochang Date: Tue, 5 Apr 2016 14:41:25 -0700 Subject: Suppress some additional msvs warnings (GN). Fixes GN build after 47ca692. R=tsepez@chromium.org,weili@chromium.org Review URL: https://codereview.chromium.org/1862773002 --- BUILD.gn | 5 ++++- third_party/BUILD.gn | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 806367e189..32d7886b98 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -42,7 +42,10 @@ config("pdfium_config") { } if (is_win) { - cflags += [ "/wd4267" ] + cflags += [ + "/wd4267", + "/wd4701", + ] } if (is_clang || is_posix) { diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index ec6f8cb7f8..f899bd1481 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -252,11 +252,24 @@ source_set("jpeg") { ] } +config("fx_libopenjpeg_warnings") { + visibility = [ ":*" ] + if (is_win) { + cflags = [ + # Signed/unsigned comparisons. + "/wd4018", + ] + } +} + source_set("fx_libopenjpeg") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", "//third_party/pdfium:pdfium_config", + + # Must be after no_chromium_code for warning flags to be ordered correctly. + ":fx_libopenjpeg_warnings", ] sources = [ "libopenjpeg20/bio.c", -- cgit v1.2.3