diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:51:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:51:37 -0700 |
| commit | 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd (patch) | |
| tree | 7406f00d80a9bf9d30573fef0a6003c9940201c4 /pdfium.gyp | |
| parent | 25d5be60c504f3df0722caea6e7a846b8e8d9537 (diff) | |
| download | pdfium-6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd.tar.xz | |
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.
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index c702de0567..0e67ef2d35 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -12,12 +12,12 @@ }, 'target_defaults': { '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', ], 'include_dirs': [ 'third_party/freetype/include', @@ -331,6 +331,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': [ @@ -352,28 +353,6 @@ '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/include/fx_png.h', 'core/src/fxcodec/fx_lpng/src/fx_png.c', 'core/src/fxcodec/fx_lpng/src/fx_pngerror.c', |