Chromium Code Reviews| Index: gyp/freetype.gyp |
| diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp |
| index 91c92b7522e485af2c1261302691aa045cc2517b..2cddabc2e27a7e9b102110186b41b2984fed91ef 100644 |
| --- a/gyp/freetype.gyp |
| +++ b/gyp/freetype.gyp |
| @@ -81,21 +81,44 @@ |
| '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module |
| '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module |
| '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support |
| + |
| + # additional components used by poppler |
| + '../third_party/externals/freetype/src/base/ftbdf.c', |
| + '../third_party/externals/freetype/src/base/ftpfr.c', |
| + '../third_party/externals/freetype/src/psaux/psaux.c', |
| + |
| + '../third_party/externals/freetype/src/pcf/pcf.c', |
|
Lei Zhang
2013/08/08 21:47:56
alphabetical in each section. I take it the sectio
ducky
2013/08/09 22:14:57
These were ordered in the order make built them. I
|
| + '../third_party/externals/freetype/src/pfr/pfr.c', |
| + '../third_party/externals/freetype/src/bdf/bdf.c', |
| + |
| + '../third_party/externals/freetype/src/type1/type1.c', |
| + '../third_party/externals/freetype/src/cid/type1cid.c', |
| + '../third_party/externals/freetype/src/type42/type42.c', |
| + '../third_party/externals/freetype/src/winfonts/winfnt.c', |
| + |
| + '../third_party/externals/freetype/src/gzip/ftgzip.c', |
| + '../third_party/externals/freetype/src/lzw/ftlzw.c', |
| ], |
| 'include_dirs': [ |
| - '../third_party/freetype/include_overrides', |
| '../third_party/externals/freetype/internal', |
| '../third_party/externals/freetype/builds', |
| '../third_party/externals/freetype/include', |
| + '../third_party/externals/freetype/include/freetype/config', |
| '../third_party/externals/freetype', |
| ], |
| - 'cflags': [ |
| - '-DFT2_BUILD_LIBRARY', |
| + 'defines': [ |
| + 'FT2_BUILD_LIBRARY', |
| + 'FT_CONFIG_CONFIG_H=<ftconfig.h>', |
| + 'FT_CONFIG_MODULES_H=<ftmodule.h>', |
| ], |
| 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'FT_CONFIG_CONFIG_H=<ftconfig.h>', |
| + 'FT_CONFIG_MODULES_H=<ftmodule.h>', |
| + ], |
| 'include_dirs': [ |
| - '../third_party/freetype/include_overrides', |
| '../third_party/externals/freetype/include', |
| + '../third_party/externals/freetype/include/freetype/config', |
| ], |
| }, |
| 'conditions': [ |