diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 11:05:02 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 11:05:02 -0700 |
| commit | 8be557542973c786d1024a7bfb300df230f00464 (patch) | |
| tree | 128ced2e83deea3920b043404336bc7ca9b0d1ef /pdfium.gyp | |
| parent | b7d358b498800e4c240d381fa6f098af17a4d95b (diff) | |
| download | pdfium-8be557542973c786d1024a7bfb300df230f00464.tar.xz | |
Merge to XFA: Move lcms2 into third_party
Original Review URL: https://codereview.chromium.org/1181943008.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1187273006.
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 6585adfad2..8a4fb0bb41 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -328,16 +328,10 @@ { 'target_name': 'fxcodec', 'type': 'static_library', - 'include_dirs': [ + 'dependencies': [ + 'third_party/third_party.gyp:fx_lcms2', ], 'ldflags': [ '-L<(PRODUCT_DIR)',], - 'msvs_settings': { - 'VCCLCompilerTool': { - # Unresolved warnings in fx_codec_jpx_opj.cpp - # https://code.google.com/p/pdfium/issues/detail?id=100 - 'WarnAsError': 'false', - }, - }, 'sources': [ 'core/include/fxcodec/fx_codec.h', 'core/include/fxcodec/fx_codec_def.h', @@ -477,31 +471,8 @@ 'core/src/fxcodec/jbig2/JBig2_SymbolDict.h', 'core/src/fxcodec/lbmp/fx_bmp.cpp', 'core/src/fxcodec/lbmp/fx_bmp.h', - 'core/src/fxcodec/lcms2/src/fx_cmscam02.c', - 'core/src/fxcodec/lcms2/src/fx_cmscgats.c', - 'core/src/fxcodec/lcms2/src/fx_cmscnvrt.c', - 'core/src/fxcodec/lcms2/src/fx_cmserr.c', - 'core/src/fxcodec/lcms2/src/fx_cmsgamma.c', - 'core/src/fxcodec/lcms2/src/fx_cmsgmt.c', - 'core/src/fxcodec/lcms2/src/fx_cmshalf.c', - 'core/src/fxcodec/lcms2/src/fx_cmsintrp.c', - 'core/src/fxcodec/lcms2/src/fx_cmsio0.c', - 'core/src/fxcodec/lcms2/src/fx_cmsio1.c', - 'core/src/fxcodec/lcms2/src/fx_cmslut.c', - 'core/src/fxcodec/lcms2/src/fx_cmsmd5.c', - 'core/src/fxcodec/lcms2/src/fx_cmsmtrx.c', - 'core/src/fxcodec/lcms2/src/fx_cmsnamed.c', - 'core/src/fxcodec/lcms2/src/fx_cmsopt.c', - 'core/src/fxcodec/lcms2/src/fx_cmspack.c', - 'core/src/fxcodec/lcms2/src/fx_cmspcs.c', - 'core/src/fxcodec/lcms2/src/fx_cmsplugin.c', - 'core/src/fxcodec/lcms2/src/fx_cmsps2.c', - 'core/src/fxcodec/lcms2/src/fx_cmssamp.c', - 'core/src/fxcodec/lcms2/src/fx_cmssm.c', - 'core/src/fxcodec/lcms2/src/fx_cmstypes.c', - 'core/src/fxcodec/lcms2/src/fx_cmsvirt.c', - 'core/src/fxcodec/lcms2/src/fx_cmswtpnt.c', - 'core/src/fxcodec/lcms2/src/fx_cmsxform.c', + 'core/src/fxcodec/lcms2/fx_lcms2.h', + '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', @@ -560,6 +531,13 @@ 'core/src/fxcodec/libjpeg/makefile', 'core/src/fxcodec/libjpeg/transupp.h', ], + 'msvs_settings': { + 'VCCLCompilerTool': { + # Unresolved warnings in fx_codec_jpx_opj.cpp + # https://code.google.com/p/pdfium/issues/detail?id=100 + 'WarnAsError': 'false', + }, + }, 'conditions': [ ['os_posix==1', { # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int |