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 /xfa.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 'xfa.gyp')
| -rw-r--r-- | xfa.gyp | 102 |
1 files changed, 51 insertions, 51 deletions
@@ -1,4 +1,7 @@ { + "variables": { + "pdf_enable_v8%": 1, + }, "target_defaults": { "defines": [ "PDF_ENABLE_XFA", @@ -663,61 +666,58 @@ "xfa/src/fxgraphics/src/fx_path_generator.cpp", "xfa/src/fxgraphics/src/fx_path_generator.h", "xfa/src/fxgraphics/src/pre.h", - "xfa/src/fxjse/src/class.cpp", - "xfa/src/fxjse/src/class.h", - "xfa/src/fxjse/src/context.cpp", - "xfa/src/fxjse/src/context.h", - "xfa/src/fxjse/src/dynprop.cpp", - "xfa/src/fxjse/src/runtime.cpp", - "xfa/src/fxjse/src/runtime.h", - "xfa/src/fxjse/src/scope_inline.h", - "xfa/src/fxjse/src/util_inline.h", - "xfa/src/fxjse/src/value.cpp", - "xfa/src/fxjse/src/value.h" ], - "conditions":[ - [ - "OS == 'win'", - { - "configurations":{ - "Debug":{ - "msvs_configuration_attributes":{ - }, - "msvs_settings":{ - "VCCLCompilerTool":{ - }, - "VCLibrarianTool":{ - }, - "VCLinkerTool":{ - } - } - }, - "Release":{ - "msvs_configuration_attributes":{ - }, - "msvs_settings":{ - "VCCLCompilerTool":{ - }, - "VCLibrarianTool":{ - }, - "VCLinkerTool":{ - } - } + "conditions": [ + ["pdf_enable_v8==1", { + 'dependencies': [ + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + ], + 'export_dependent_settings': [ + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + ], + 'include_dirs': [ + '<(DEPTH)/v8', + '<(DEPTH)/v8/include', + ], + 'sources': [ + "xfa/src/fxjse/src/class.cpp", + "xfa/src/fxjse/src/class.h", + "xfa/src/fxjse/src/context.cpp", + "xfa/src/fxjse/src/context.h", + "xfa/src/fxjse/src/dynprop.cpp", + "xfa/src/fxjse/src/runtime.cpp", + "xfa/src/fxjse/src/runtime.h", + "xfa/src/fxjse/src/scope_inline.h", + "xfa/src/fxjse/src/util_inline.h", + "xfa/src/fxjse/src/value.cpp", + "xfa/src/fxjse/src/value.h" + ], + }], + ["OS == 'win'", { + "configurations": { + "Debug": { + "msvs_configuration_attributes": {}, + "msvs_settings": { + "VCCLCompilerTool": {}, + "VCLibrarianTool": {}, + "VCLinkerTool": {}, } }, - "sources":[ - ] - } - ], - [ - "OS == 'mac'", - { - "configurations":{ + "Release": { + "msvs_configuration_attributes": {}, + "msvs_settings": { + "VCCLCompilerTool": {}, + "VCLibrarianTool": {}, + "VCLinkerTool": {}, + } + } }, - "sources":[ - ] - } - ] + "sources": [], + }], + ["OS == 'mac'", { + "configurations": {}, + "sources": [], + }], ] } ] |