| Index: gyp/freetype.gyp
|
| diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
|
| index 91fc0b3db690d3979b6e7e03282c518649e8cf9b..8800674f6f0412d5f89468fe4bdd51d6a0bb8c25 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
|
|
|