diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 14:02:32 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 14:02:32 +0000 |
| commit | f41ca79112732abbea323b2653368fae5eda46db (patch) | |
| tree | ae216bc6ae180cf936cb3f3df890c93879069e15 | |
| parent | 31c4e8997c23960f0571f294a3d599f86a42ebc0 (diff) | |
Remove freetype dependency from core.gyp
Review URL: https://codereview.chromium.org/13975014
git-svn-id: http://skia.googlecode.com/svn/trunk@8677 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/core.gyp | 2 | ||||
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index 5f99fd911e..cc5cfbd388 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -75,7 +75,7 @@ 'config/win', ], }], - [ 'skia_os in ("android", "nacl")', { + [ 'skia_os == "nacl"', { 'dependencies': [ 'freetype.gyp:freetype', ], diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index e41bb810b5..fb1325cc69 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -16,7 +16,7 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics) #include <dwrite.h> #endif -#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +#if defined(SK_BUILD_FOR_NACL) #include <ft2build.h> #include FT_FREETYPE_H #endif @@ -268,6 +268,8 @@ template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( uint32_t subsetGlyphIDsLength, bool (*getAdvance)(IDWriteFontFace* fontFace, int gId, int16_t* data)); #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +struct FT_FaceRec; +typedef struct FT_FaceRec_* FT_Face; template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( FT_Face face, int num_glyphs, |