| Index: pdfium.gyp
|
| diff --git a/pdfium.gyp b/pdfium.gyp
|
| index eedbe5da374770fd0629d5a584eb6d22b448ab51..9adf1032531f756eb208c228d6d673c278bcdbf5 100644
|
| --- a/pdfium.gyp
|
| +++ b/pdfium.gyp
|
| @@ -1,21 +1,37 @@
|
| {
|
| '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',
|
| ],
|
| - 'include_dirs': [
|
| - 'third_party/freetype/include',
|
| - ],
|
| 'conditions': [
|
| ['pdf_use_skia==1', {
|
| 'defines': ['_SKIA_SUPPORT_'],
|
| }],
|
| + ['bundle_freetype==1', {
|
| + 'include_dirs': [
|
| + 'third_party/freetype/include',
|
| + ],
|
| + 'defines' : [
|
| + 'FT2_BUILD_LIBRARY',
|
| + ],
|
| + }, {
|
| + 'include_dirs' : [
|
| + '/usr/include/freetype2',
|
| + ],
|
| + }],
|
| ['OS=="linux"', {
|
| 'conditions': [
|
| ['target_arch=="x64"', {
|
| @@ -38,7 +54,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',
|
| @@ -102,6 +117,17 @@
|
| 'fpdfsdk/src/fpdfsdkdll.rc',
|
| ],
|
| }],
|
| + ['bundle_freetype==1', {
|
| + 'dependencies': [
|
| + 'third_party/third_party.gyp:freetype',
|
| + ],
|
| + }, {
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-lfreetype',
|
| + ],
|
| + },
|
| + }],
|
| ],
|
| 'all_dependent_settings': {
|
| 'msvs_settings': {
|
|
|