diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
| commit | ef4dce44bb4b990f301a98853075f501c6f053d7 (patch) | |
| tree | 006cd513695df7d324fce1fd1b4a58af3902d799 /pdfium.gyp | |
| parent | 3795a748bb3fb7fc3f2c6196af1f89627ac37f4e (diff) | |
| download | pdfium-ef4dce44bb4b990f301a98853075f501c6f053d7.tar.xz | |
Merge the following changes to XFA branch:
b3a788e Fix GN PDFium build when building all. by John Abd-El-Malek - 19 hours ago chromium/2293
f8af677 Always use the FreeType headers included in PDFium. by John Abd-El-Malek - 24 hours ago
dc8c950 Don't export any OpenJPEG methods from PDFium. by John Abd-El-Malek - 3 days ago
71c24b8 Use system FreeType on Linux. by John Abd-El-Malek - 3 days ago
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/900433002
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 425327ed0f..c9f54d7d2a 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -1,10 +1,17 @@ { 'variables': { 'pdf_use_skia%': 0, + 'conditions': [ + ['OS=="linux"', { + 'bundle_freetype%': 0, + }, { # On Android there's no system FreeType. On Windows and Mac, only a + # few methods are used from it. + 'bundle_freetype%': 1, + }], + ], }, 'target_defaults': { 'defines' : [ - 'FT2_BUILD_LIBRARY', '_FPDFSDK_LIB', '_NO_GDIPLUS_', # workaround text rendering issues on Windows 'OPJ_STATIC', @@ -38,7 +45,6 @@ 'type': 'static_library', 'dependencies': [ 'third_party/third_party.gyp:bigint', - 'third_party/third_party.gyp:freetype', 'third_party/third_party.gyp:safemath', 'fdrm', 'fpdfdoc', @@ -103,6 +109,17 @@ 'fpdfsdk/src/fpdfsdkdll.rc', ], }], + ['bundle_freetype==1', { + 'dependencies': [ + 'third_party/third_party.gyp:freetype', + ], + }, { + 'link_settings': { + 'libraries': [ + '-lfreetype', + ], + }, + }], ], 'all_dependent_settings': { 'msvs_settings': { |