diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-17 13:24:56 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-17 13:24:56 -0400 |
| commit | 4fdbf0b30ad54705cc2a0ee289f13e40ce123bdf (patch) | |
| tree | 15cfb571df97946c7f6a1b6ac9805a5a0e2d306a | |
| parent | 59b3a481fee140ed2508916e02addb8f3959ec7b (diff) | |
| download | pdfium-4fdbf0b30ad54705cc2a0ee289f13e40ce123bdf.tar.xz | |
Fix windows pdfium_use_skia build.
This CL fixes up build issues with pdfium_use_skia=1 on windows.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1810063002 .
| -rw-r--r-- | skia/skia_common.gypi | 5 | ||||
| -rw-r--r-- | third_party/third_party.gyp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 4b7a51b6b1..0a8e019611 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -26,6 +26,11 @@ 'SK_BUILD_FOR_IOS', ], }], + [ 'OS == "win"', { + 'defines': [ + 'SK_BUILD_FOR_WIN32', + ], + }], [ 'OS != "mac"', { 'sources/': [ ['exclude', '_mac\\.(cc|cpp|mm?)$'], diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 758d23ef0d..665de0a146 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -327,6 +327,13 @@ '-Wno-shift-negative-value', ], }], + ['OS == "win"', { + 'direct_dependent_settings': { + 'include_dirs': [ + 'zlib_v128', + ], + } + }], ], 'variables': { 'clang_warning_flags': [ |