From c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 17:17:14 -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 Review URL: https://codereview.chromium.org/1185373010. --- BUILD.gn | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index 97a475d22f..76e05d6360 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -338,6 +338,7 @@ static_library("fxcodec") { deps = [ "third_party:fx_lcms2", "third_party:fx_libjpeg", + "third_party:fx_libopenjpeg", ] sources = [ "core/include/fxcodec/fx_codec.h", @@ -352,28 +353,6 @@ static_library("fxcodec") { "core/src/fxcodec/codec/fx_codec_jbig_enc.cpp", "core/src/fxcodec/codec/fx_codec_jpeg.cpp", "core/src/fxcodec/codec/fx_codec_jpx_opj.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_zlib/include/fx_zlib.h", "core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c", "core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c", -- cgit v1.2.3