diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/BUILD.gn | 7 | ||||
| -rw-r--r-- | third_party/third_party.gyp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index b1fc5487c4..214614c8b6 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -46,6 +46,7 @@ static_library("fx_freetype") { 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_freetype_warnings", ] @@ -96,6 +97,7 @@ source_set("fx_agg") { 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_agg_warnings", ] @@ -125,6 +127,7 @@ config("fx_lcms2_warnings") { # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this # library doesn't appear to have this problem. "-Wno-missing-braces", + # FindPrev() in cmsplugin.c is unused. "-Wno-unused-function", ] @@ -136,6 +139,7 @@ source_set("fx_lcms2") { 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_lcms2_warnings", ] @@ -170,7 +174,8 @@ source_set("fx_lcms2") { ] } -source_set("fx_libjpeg") { +# This is only used for standalone builds. +source_set("jpeg") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 43e1093fc3..78aa6fc657 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -8,6 +8,11 @@ 'OPJ_STATIC', '_CRT_SECURE_NO_WARNINGS', ], + 'include_dirs': [ + # This is implicit in GN. + '<(DEPTH)', + '..', + ], 'msvs_disabled_warnings': [ 4005, 4018, 4146, 4333, 4345, 4267 ], @@ -161,7 +166,7 @@ }, }, { - 'target_name': 'fx_libjpeg', + 'target_name': 'libjpeg', 'type': 'static_library', 'sources': [ 'libjpeg/cderror.h', |