diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:05:27 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:05:27 -0700 |
| commit | e295819e5ded76e405b6d5800401cb5983b4ce10 (patch) | |
| tree | 64f28bd7e305081576c5509cdef42126561467c4 /pdfium.gyp | |
| parent | aa23c864b84d99f23a82ee8da852e575db981c07 (diff) | |
| download | pdfium-e295819e5ded76e405b6d5800401cb5983b4ce10.tar.xz | |
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.
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 8b19c83d08..6d9dbf3ee4 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -7,14 +7,14 @@ }, { # On Android there's no system FreeType. On Windows and Mac, only a # few methods are used from it. 'bundle_freetype%': 1, - }], + }], ], }, 'target_defaults': { 'defines' : [ - '_FPDFSDK_LIB', - '_NO_GDIPLUS_', # workaround text rendering issues on Windows 'OPJ_STATIC', + 'V8_DEPRECATION_WARNINGS', + '_CRT_SECURE_NO_WARNINGS', ], 'include_dirs': [ 'third_party/freetype/include', @@ -327,6 +327,7 @@ 'dependencies': [ 'third_party/third_party.gyp:fx_lcms2', 'third_party/third_party.gyp:fx_libjpeg', + 'third_party/third_party.gyp:fx_libopenjpeg', ], 'ldflags': [ '-L<(PRODUCT_DIR)',], 'sources': [ @@ -342,28 +343,6 @@ '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', |