diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 15:46:03 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 15:46:03 -0700 |
| commit | 0a11975b69d93edd9a65704ee9559774b7a35f5b (patch) | |
| tree | d1a5a8fb5f12fd7a3708b346a6e889521b18ca37 /pdfium.gyp | |
| parent | 8be557542973c786d1024a7bfb300df230f00464 (diff) | |
| download | pdfium-0a11975b69d93edd9a65704ee9559774b7a35f5b.tar.xz | |
Merge to XFA: Move libjpeg to third_party/
Original Review URL: https://codereview.chromium.org/1186113005.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1175193007.
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 8a4fb0bb41..c702de0567 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -330,6 +330,7 @@ 'type': 'static_library', 'dependencies': [ 'third_party/third_party.gyp:fx_lcms2', + 'third_party/third_party.gyp:fx_libjpeg', ], 'ldflags': [ '-L<(PRODUCT_DIR)',], 'sources': [ @@ -475,61 +476,7 @@ 'core/src/fxcodec/lcms2/fx_lcms2_plugin.h', 'core/src/fxcodec/lgif/fx_gif.cpp', 'core/src/fxcodec/lgif/fx_gif.h', - 'core/src/fxcodec/libjpeg/cderror.h', - 'core/src/fxcodec/libjpeg/cdjpeg.h', - 'core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jccolor.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jchuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcinit.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcparam.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcsample.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jctrans.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdinput.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdsample.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jerror.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctint.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctred.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jutils.c', - 'core/src/fxcodec/libjpeg/jchuff.h', - 'core/src/fxcodec/libjpeg/jconfig.h', - 'core/src/fxcodec/libjpeg/jdct.h', - 'core/src/fxcodec/libjpeg/jdhuff.h', - 'core/src/fxcodec/libjpeg/jerror.h', - 'core/src/fxcodec/libjpeg/jinclude.h', - 'core/src/fxcodec/libjpeg/jmemsys.h', - 'core/src/fxcodec/libjpeg/jmorecfg.h', - 'core/src/fxcodec/libjpeg/jpegint.h', - 'core/src/fxcodec/libjpeg/jpeglib.h', - 'core/src/fxcodec/libjpeg/jversion.h', - 'core/src/fxcodec/libjpeg/makefile', - 'core/src/fxcodec/libjpeg/transupp.h', + 'core/src/fxcodec/libjpeg/fx_libjpeg.h', ], 'msvs_settings': { 'VCCLCompilerTool': { |