diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 12:22:11 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 12:22:11 +0000 |
| commit | 2e767c35ca082b41f76e9de811a093f196485b6d (patch) | |
| tree | f614066ef15010226fea35317ca88163cf110dde /gyp | |
| parent | bc2555897b797016ae1d24514b3ded4d065b958e (diff) | |
Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs
R=bungeman@google.com
Review URL: https://codereview.chromium.org/19931003
git-svn-id: http://skia.googlecode.com/svn/trunk@10259 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/freetype.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 91fc0b3db6..8800674f6f 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -42,6 +42,10 @@ 'target_name': 'freetype_static', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + # we are dependent upon PNG for color emoji glyphs + 'images.gyp:images' + ], 'sources': [ # base components (required) '../third_party/externals/freetype/src/base/ftsystem.c', @@ -80,6 +84,7 @@ '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ + '../third_party/freetype', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -94,6 +99,11 @@ ], }, 'conditions': [ + [ 'skia_warnings_as_errors', { + 'cflags!': [ + '-Werror', + ], + }], [ 'skia_os == "mac"', { 'sources': [ '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh |