Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: gyp/freetype.gyp

Issue 19931003: Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'freetype', 4 'target_name': 'freetype',
5 'type': 'none', 5 'type': 'none',
6 'conditions': [ 6 'conditions': [
7 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 7 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
8 'direct_dependent_settings': { 8 'direct_dependent_settings': {
9 'include_dirs' : [ 9 'include_dirs' : [
10 '/usr/include/freetype2', 10 '/usr/include/freetype2',
(...skipping 13 matching lines...) Expand all
24 [ 'skia_os in ["android", "nacl"]', { 24 [ 'skia_os in ["android", "nacl"]', {
25 'dependencies': [ 25 'dependencies': [
26 'freetype_static' 26 'freetype_static'
27 ], 27 ],
28 'export_dependent_settings': [ 28 'export_dependent_settings': [
29 'freetype_static' 29 'freetype_static'
30 ], 30 ],
31 'direct_dependent_settings': { 31 'direct_dependent_settings': {
32 'defines': [ 32 'defines': [
33 # Both Android and NaCl provide at least FreeType 2.4.0 33 # Both Android and NaCl provide at least FreeType 2.4.0
34 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', 34 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
bungeman-skia 2013/07/22 20:42:13 Haven't really looked into this, but will we need
35 'SK_CAN_USE_DLOPEN=0', 35 'SK_CAN_USE_DLOPEN=0',
36 ], 36 ],
37 }, 37 },
38 }], 38 }],
39 ], 39 ],
40 }, 40 },
41 { 41 {
42 'target_name': 'freetype_static', 42 'target_name': 'freetype_static',
43 'type': 'static_library', 43 'type': 'static_library',
44 'standalone_static_library': 1, 44 'standalone_static_library': 1,
45 'dependencies': [
46 # we are dependent upon PNG for color emoji glyphs
47 'images.gyp:images'
48 ],
45 'sources': [ 49 'sources': [
46 # base components (required) 50 # base components (required)
47 '../third_party/externals/freetype/src/base/ftsystem.c', 51 '../third_party/externals/freetype/src/base/ftsystem.c',
48 '../third_party/externals/freetype/src/base/ftinit.c', 52 '../third_party/externals/freetype/src/base/ftinit.c',
49 '../third_party/externals/freetype/src/base/ftdebug.c', 53 '../third_party/externals/freetype/src/base/ftdebug.c',
50 '../third_party/externals/freetype/src/base/ftbase.c', 54 '../third_party/externals/freetype/src/base/ftbase.c',
51 55
52 '../third_party/externals/freetype/src/base/ftbbox.c', # recommend ed, see <freetype/ftbbox.h> 56 '../third_party/externals/freetype/src/base/ftbbox.c', # recommend ed, see <freetype/ftbbox.h>
53 '../third_party/externals/freetype/src/base/ftglyph.c', # recommend ed, see <freetype/ftglyph.h> 57 '../third_party/externals/freetype/src/base/ftglyph.c', # recommend ed, see <freetype/ftglyph.h>
54 58
(...skipping 18 matching lines...) Expand all
73 '../third_party/externals/freetype/src/raster/raster.c', # monochrom e rasterizer 77 '../third_party/externals/freetype/src/raster/raster.c', # monochrom e rasterizer
74 '../third_party/externals/freetype/src/smooth/smooth.c', # anti-alia sing rasterizer 78 '../third_party/externals/freetype/src/smooth/smooth.c', # anti-alia sing rasterizer
75 79
76 # auxiliary modules (optional) 80 # auxiliary modules (optional)
77 '../third_party/externals/freetype/src/autofit/autofit.c', # auto hint ing module 81 '../third_party/externals/freetype/src/autofit/autofit.c', # auto hint ing module
78 '../third_party/externals/freetype/src/psaux/psaux.c', # PostScrip t Type 1 parsing 82 '../third_party/externals/freetype/src/psaux/psaux.c', # PostScrip t Type 1 parsing
79 '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hintin g module 83 '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hintin g module
80 '../third_party/externals/freetype/src/psnames/psnames.c', # PostScrip t glyph names support 84 '../third_party/externals/freetype/src/psnames/psnames.c', # PostScrip t glyph names support
81 ], 85 ],
82 'include_dirs': [ 86 'include_dirs': [
87 '../third_party/freetype',
83 '../third_party/externals/freetype/internal', 88 '../third_party/externals/freetype/internal',
84 '../third_party/externals/freetype/builds', 89 '../third_party/externals/freetype/builds',
85 '../third_party/externals/freetype/include', 90 '../third_party/externals/freetype/include',
86 '../third_party/externals/freetype', 91 '../third_party/externals/freetype',
87 ], 92 ],
88 'cflags': [ 93 'cflags': [
89 '-DFT2_BUILD_LIBRARY', 94 '-DFT2_BUILD_LIBRARY',
90 ], 95 ],
91 'direct_dependent_settings': { 96 'direct_dependent_settings': {
92 'include_dirs': [ 97 'include_dirs': [
93 '../third_party/externals/freetype/include', 98 '../third_party/externals/freetype/include',
94 ], 99 ],
95 }, 100 },
96 'conditions': [ 101 'conditions': [
102 [ 'skia_warnings_as_errors', {
103 'cflags!': [
104 '-Werror',
105 ],
106 }],
97 [ 'skia_os == "mac"', { 107 [ 'skia_os == "mac"', {
98 'sources': [ 108 'sources': [
99 '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh 109 '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh
100 ], 110 ],
101 }], 111 }],
102 [ 'skia_os == "android"', { 112 [ 'skia_os == "android"', {
103 # These flags are used by the Android OS. They are probably overkill 113 # These flags are used by the Android OS. They are probably overkill
104 # for Skia, but we add them for consistency. 114 # for Skia, but we add them for consistency.
105 'cflags': [ 115 'cflags': [
106 '-W', 116 '-W',
107 '-Wall', 117 '-Wall',
108 '-fPIC', 118 '-fPIC',
109 '-DPIC', 119 '-DPIC',
110 '-DDARWIN_NO_CARBON', 120 '-DDARWIN_NO_CARBON',
111 '-DFT2_BUILD_LIBRARY', 121 '-DFT2_BUILD_LIBRARY',
112 '-O2', 122 '-O2',
113 ], 123 ],
114 }], 124 }],
115 ], 125 ],
116 }, 126 },
117 ], 127 ],
118 } 128 }
119 129
120 # Local Variables: 130 # Local Variables:
121 # tab-width:2 131 # tab-width:2
122 # indent-tabs-mode:nil 132 # indent-tabs-mode:nil
123 # End: 133 # End:
124 # vim: set expandtab tabstop=2 shiftwidth=2: 134 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698