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/third_party.gyp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'third_party/third_party.gyp') diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 6dbff565a4..240d65bca4 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -3,6 +3,15 @@ # found in the LICENSE file. { + 'target_defaults': { + 'defines': [ + 'OPJ_STATIC', + '_CRT_SECURE_NO_WARNINGS', + ], + 'msvs_disabled_warnings': [ + 4005, 4018, 4146, 4333, 4345, 4267 + ], + }, 'targets': [ { 'target_name': 'bigint', @@ -199,6 +208,31 @@ }], ], }, + { + 'target_name': 'fx_libopenjpeg', + 'type': 'static_library', + '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', + ], + }, { 'target_name': 'pdfium_base', 'type': 'none', -- cgit v1.2.3