Index: pdfium.gyp |
diff --git a/pdfium.gyp b/pdfium.gyp |
index cc28ada6299d983a8ac55d4168d8e735621972c4..15e7df0e4c589f566ec943152eaaba657a30d625 100644 |
--- a/pdfium.gyp |
+++ b/pdfium.gyp |
@@ -4,11 +4,14 @@ |
}, |
'target_defaults': { |
'defines' : [ |
- '_FXFT_VERSION_=2501', |
+ '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_'], |
@@ -34,8 +37,9 @@ |
'target_name': 'pdfium', |
'type': 'static_library', |
'dependencies': [ |
- 'safemath', |
- 'bigint', |
+ 'third_party/third_party.gyp:bigint', |
+ 'third_party/third_party.gyp:freetype', |
+ 'third_party/third_party.gyp:safemath', |
'fdrm', |
'fpdfdoc', |
'fpdfapi', |
@@ -122,35 +126,6 @@ |
}, |
}, |
{ |
- 'target_name': 'safemath', |
- 'type': 'none', |
- 'sources': [ |
- 'third_party/logging.h', |
- 'third_party/macros.h', |
- 'third_party/template_util.h', |
- 'third_party/numerics/safe_conversions.h', |
- 'third_party/numerics/safe_conversions_impl.h', |
- 'third_party/numerics/safe_math.h', |
- 'third_party/numerics/safe_math_impl.h', |
- ], |
- }, |
- { |
- 'target_name': 'bigint', |
- 'type': 'static_library', |
- 'sources': [ |
- 'third_party/bigint/BigInteger.hh', |
- 'third_party/bigint/BigIntegerLibrary.hh', |
- 'third_party/bigint/BigIntegerUtils.hh', |
- 'third_party/bigint/BigUnsigned.hh', |
- 'third_party/bigint/NumberlikeArray.hh', |
- 'third_party/bigint/BigUnsignedInABase.hh', |
- 'third_party/bigint/BigInteger.cc', |
- 'third_party/bigint/BigIntegerUtils.cc', |
- 'third_party/bigint/BigUnsigned.cc', |
- 'third_party/bigint/BigUnsignedInABase.cc', |
- ], |
- }, |
- { |
'target_name': 'fdrm', |
'type': 'static_library', |
'ldflags': [ '-L<(PRODUCT_DIR)',], |
@@ -612,34 +587,7 @@ |
'core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c', |
'core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c', |
'core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c', |
- 'core/src/fxge/fx_freetype/include/fxft_cffobjs.h', |
- 'core/src/fxge/fx_freetype/include/fxft_cfftypes.h', |
- 'core/src/fxge/fx_freetype/include/fxft_freetype.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ft2build.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ftmm.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ftobjs.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ftotval.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ftoutln.h', |
- 'core/src/fxge/fx_freetype/include/fxft_ftstream.h', |
- 'core/src/fxge/fx_freetype/include/fxft_tttables.h', |
- 'core/src/fxge/fx_freetype/include/fxft_tttypes.h', |
- 'core/src/fxge/fx_freetype/src/fxft_cff.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftbase.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftbitmap.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftglyph.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftinit.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftlcdfil.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftmm.c', |
- 'core/src/fxge/fx_freetype/src/fxft_ftsystem.c', |
- 'core/src/fxge/fx_freetype/src/fxft_psaux.c', |
- 'core/src/fxge/fx_freetype/src/fxft_pshinter.c', |
- 'core/src/fxge/fx_freetype/src/fxft_psmodule.c', |
- 'core/src/fxge/fx_freetype/src/fxft_raster.c', |
- 'core/src/fxge/fx_freetype/src/fxft_sfnt.c', |
- 'core/src/fxge/fx_freetype/src/fxft_smooth.c', |
- 'core/src/fxge/fx_freetype/src/fxft_truetype.c', |
- 'core/src/fxge/fx_freetype/src/fxft_type1.c', |
- 'core/src/fxge/fx_freetype/src/fxft_type1cid.c', |
+ 'core/src/fxge/freetype/fx_freetype.c', |
'core/src/fxge/ge/fx_ge.cpp', |
'core/src/fxge/ge/fx_ge_device.cpp', |
'core/src/fxge/ge/fx_ge_font.cpp', |