From e295819e5ded76e405b6d5800401cb5983b4ce10 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 17:05:27 -0700 Subject: Move libopenjpeg to third_party/ We get to delete a whole bunch of fx_foo.c files that did nothing but #include "foo.c" after defining _CRT_SECURE_NO_WARNINGS. Do this from the .gyp/.gn files instead. Also sort some "config"s in .gn file. R=thestig@chromium.org Committed: https://pdfium.googlesource.com/pdfium/+/c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a Review URL: https://codereview.chromium.org/1185373010. --- third_party/BUILD.gn | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'third_party/BUILD.gn') diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 11da543683..be6538e990 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -13,8 +13,8 @@ group("third_party") { source_set("bigint") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//third_party/pdfium:pdfium_config", "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] sources = [ "bigint/BigInteger.cc", @@ -33,8 +33,8 @@ source_set("bigint") { source_set("freetype") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ - "//third_party/pdfium:pdfium_config", "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] defines = [ "FT2_BUILD_LIBRARY" ] sources = [ @@ -196,11 +196,40 @@ source_set("fx_libjpeg") { ] } -source_set("pdfium_base") { +source_set("fx_libopenjpeg") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ + "//build/config/compiler:no_chromium_code", "//third_party/pdfium:pdfium_config", + ] + sources = [ + "libopenjpeg20/bio.c", + "libopenjpeg20/cio.c", + "libopenjpeg20/dwt.c", + "libopenjpeg20/event.c", + "libopenjpeg20/function_list.c", + "libopenjpeg20/image.c", + "libopenjpeg20/invert.c", + "libopenjpeg20/j2k.c", + "libopenjpeg20/jp2.c", + "libopenjpeg20/mct.c", + "libopenjpeg20/mqc.c", + "libopenjpeg20/openjpeg.c", + "libopenjpeg20/opj_clock.c", + "libopenjpeg20/pi.c", + "libopenjpeg20/raw.c", + "libopenjpeg20/t1.c", + "libopenjpeg20/t2.c", + "libopenjpeg20/tcd.c", + "libopenjpeg20/tgt.c", + ] +} + +source_set("pdfium_base") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", ] sources = [ "base/logging.h", -- cgit v1.2.3