diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-13 09:27:27 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-13 09:27:27 -0700 |
commit | 452b4f3f0ce1411350d57373528ccde77e40727d (patch) | |
tree | db9049209ff1f754026e680e6c18361ae4bc1a85 /samples/samples.gyp | |
parent | e865ed12c4a476a4c74bf1ae97d3a6fa8ca06f0a (diff) | |
download | pdfium-452b4f3f0ce1411350d57373528ccde77e40727d.tar.xz |
Merge to XFA: Allow compiling PDFium without V8.
Original Review URL: https://codereview.chromium.org/1395733006 .
(cherry picked from commit f1c713663192368d26031a4caed1f9705f4510af)
Conflicts:
BUILD.gn
fpdfsdk/src/fpdfview.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
pdfium.gyp
samples/BUILD.gn
samples/samples.gyp
BUG=pdfium:211
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1393833006 .
Diffstat (limited to 'samples/samples.gyp')
-rw-r--r-- | samples/samples.gyp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/samples/samples.gyp b/samples/samples.gyp index 97497ee2d9..e39af20882 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -3,30 +3,49 @@ # found in the LICENSE file. { + 'variables': { + 'pdf_enable_v8%': 1, + }, 'target_defaults': { 'type': 'executable', 'dependencies': [ '../pdfium.gyp:pdfium', - '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', ], 'include_dirs': [ '<(DEPTH)', - '<(DEPTH)/v8', - '<(DEPTH)/v8/include', ], 'defines' : [ 'PNG_PREFIX', 'PNGPREFIX_H', 'PNG_USE_READ_MACROS', ], + 'conditions': [ + ['pdf_enable_v8==1', { + 'defines': [ + 'PDF_ENABLE_V8', + ], + 'include_dirs': [ + '<(DEPTH)/v8', + '<(DEPTH)/v8/include', + ], + }], + ], }, 'targets': [ { 'target_name': 'pdfium_test', + 'type': 'executable', 'sources': [ 'pdfium_test.cc', 'image_diff_png.cc', ], + 'conditions': [ + ['pdf_enable_v8==1', { + 'dependencies': [ + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', + ], + }], + ], }, { 'target_name': 'pdfium_diff', |