From 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 17:51:37 -0700 Subject: Merge to XFA: Move libopenjpeg to third_party/ Original Review URL: https://codereview.chromium.org/1185373010. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1193773002. --- BUILD.gn | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index d30fabae28..0199beadb4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,13 +16,12 @@ config("pdfium_config") { cflags = [] include_dirs = [ "third_party/freetype/include" ] defines = [ - "_FPDFSDK_LIB", - "_NO_GDIPLUS_", # workaround text rendering issues on Windows "OPJ_STATIC", "PNG_PREFIX", "PNGPREFIX_H", "PNG_USE_READ_MACROS", "V8_DEPRECATION_WARNINGS", + "_CRT_SECURE_NO_WARNINGS", ] if (pdf_use_skia) { @@ -318,6 +317,7 @@ static_library("fxcodec") { deps = [ "third_party:fx_lcms2", "third_party:fx_libjpeg", + "third_party:fx_libopenjpeg", ] sources = [ "core/include/fxcodec/fx_codec.h", @@ -338,28 +338,6 @@ static_library("fxcodec") { "core/src/fxcodec/codec/fx_codec_progress.cpp", "core/src/fxcodec/codec/fx_codec_progress.h", "core/src/fxcodec/codec/fx_codec_tiff.cpp", - "core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h", - "core/src/fxcodec/fx_libopenjpeg/src/fx_bio.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_cio.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_dwt.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_event.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_function_list.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_image.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_invert.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_j2k.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_j2k_lib.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_jpt.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_mqc.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg_jp2.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_opj_clock.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_pi.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_raw.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_t1.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_t2.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_tcd.c", - "core/src/fxcodec/fx_libopenjpeg/src/fx_tgt.c", "core/src/fxcodec/fx_lpng/src/fx_png.c", "core/src/fxcodec/fx_lpng/src/fx_pngerror.c", "core/src/fxcodec/fx_lpng/src/fx_pngget.c", -- cgit v1.2.3