Revert "The CL adds libpoppler to DEPS and adds a libpoppler-cpp gyp target for Linux, Windows, and Mac. This does not currently change the GM tool to use poppler - that will be a refactor job in a separate CL."
This reverts commit r10823
TBR=richardlin@chromium.org
Review URL: https://codereview.chromium.org/23190020
git-svn-id: http://skia.googlecode.com/svn/trunk@10828 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index c4c079c..91c92b7 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -46,17 +46,69 @@
# we are dependent upon PNG for color emoji glyphs
'images.gyp:images'
],
- 'includes': [
- # common freetype sources needed for both the base Skia build and the
- # libpoppler build for testing only
- 'freetype.gypi',
+ 'sources': [
+ # base components (required)
+ '../third_party/externals/freetype/src/base/ftsystem.c',
+ '../third_party/externals/freetype/src/base/ftinit.c',
+ '../third_party/externals/freetype/src/base/ftdebug.c',
+ '../third_party/externals/freetype/src/base/ftbase.c',
+
+ '../third_party/externals/freetype/src/base/ftbbox.c', # recommended, see <freetype/ftbbox.h>
+ '../third_party/externals/freetype/src/base/ftglyph.c', # recommended, see <freetype/ftglyph.h>
+
+ '../third_party/externals/freetype/src/base/ftbitmap.c', # optional, see <freetype/ftbitmap.h>
+ '../third_party/externals/freetype/src/base/ftfstype.c', # optional
+ '../third_party/externals/freetype/src/base/ftgasp.c', # optional, see <freetype/ftgasp.h>
+ '../third_party/externals/freetype/src/base/ftlcdfil.c', # optional, see <freetype/ftlcdfil.h>
+ '../third_party/externals/freetype/src/base/ftmm.c', # optional, see <freetype/ftmm.h>
+ '../third_party/externals/freetype/src/base/ftpatent.c', # optional
+ '../third_party/externals/freetype/src/base/ftstroke.c', # optional, see <freetype/ftstroke.h>
+ '../third_party/externals/freetype/src/base/ftsynth.c', # optional, see <freetype/ftsynth.h>
+ '../third_party/externals/freetype/src/base/fttype1.c', # optional, see <freetype/t1tables.h>
+ '../third_party/externals/freetype/src/base/ftwinfnt.c', # optional, see <freetype/ftwinfnt.h>
+ '../third_party/externals/freetype/src/base/ftxf86.c', # optional, see <freetype/ftxf86.h>
+
+ # font drivers (optional; at least one is needed)
+ '../third_party/externals/freetype/src/cff/cff.c', # CFF/OpenType font driver
+ '../third_party/externals/freetype/src/sfnt/sfnt.c', # SFNT files support (TrueType & OpenType)
+ '../third_party/externals/freetype/src/truetype/truetype.c', # TrueType font driver
+
+ # rasterizers (optional; at least one is needed for vector formats)
+ '../third_party/externals/freetype/src/raster/raster.c', # monochrome rasterizer
+ '../third_party/externals/freetype/src/smooth/smooth.c', # anti-aliasing rasterizer
+
+ # auxiliary modules (optional)
+ '../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
+ ],
+ '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',
+ ],
+ 'cflags': [
+ '-DFT2_BUILD_LIBRARY',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/freetype/include_overrides',
+ '../third_party/externals/freetype/include',
],
},
'conditions': [
+ [ 'skia_warnings_as_errors', {
+ 'cflags!': [
+ '-Werror',
+ ],
+ }],
+ [ 'skia_os == "mac"', {
+ 'sources': [
+ '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh
+ ],
+ }],
[ 'skia_os == "android"', {
# These flags are used by the Android OS. They are probably overkill
# for Skia, but we add them for consistency.
@@ -72,31 +124,6 @@
}],
],
},
- {
- 'target_name': 'freetype_poppler',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- 'includes': [
- 'freetype.gypi',
- ],
- 'sources': [
- # 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/bdf/bdf.c',
- '../third_party/externals/freetype/src/cid/type1cid.c',
- '../third_party/externals/freetype/src/pcf/pcf.c',
- '../third_party/externals/freetype/src/pfr/pfr.c',
- '../third_party/externals/freetype/src/psaux/psaux.c',
- '../third_party/externals/freetype/src/type1/type1.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',
- ],
- },
],
}