OLD | NEW |
---|---|
1 # Target for building freetype. | 1 # Target for building freetype. |
2 { | 2 { |
3 'targets': [ | 3 'targets': [ |
4 { | 4 { |
5 'target_name': 'freetype', | 5 'target_name': 'freetype', |
scroggo
2014/02/06 16:22:13
You'll need to do a rebase onto my recent changes
hal.canary
2014/02/06 18:01:57
Done, if you mean https://codereview.chromium.org/
| |
6 'type': 'none', | 6 'type': 'none', |
7 'conditions': [ | 7 'conditions': [ |
8 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 8 [ 'not skia_freetype_static and skia_os in ["linux", "freebsd", "openbsd ", "solaris", "chromeos"]', { |
scroggo
2014/02/06 16:22:13
nit: over 100 chars.
hal.canary
2014/02/06 18:01:57
Done.
| |
9 'direct_dependent_settings': { | 9 'direct_dependent_settings': { |
10 'include_dirs' : [ | 10 'include_dirs' : [ |
11 '/usr/include/freetype2', | 11 '/usr/include/freetype2', |
12 ], | 12 ], |
13 'link_settings': { | 13 'link_settings': { |
14 'libraries': [ | 14 'libraries': [ |
15 '-lfreetype', | 15 '-lfreetype', |
16 ], | 16 ], |
17 'defines': [ | 17 'defines': [ |
18 #The font host requires at least FreeType 2.3.0 at runtime. | 18 #The font host requires at least FreeType 2.3.0 at runtime. |
19 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ | 19 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ |
20 'SK_CAN_USE_DLOPEN=1', | 20 'SK_CAN_USE_DLOPEN=1', |
21 ], | 21 ], |
22 } | 22 } |
23 }, | 23 }, |
24 }], | 24 }], |
25 [ 'skia_os in ["android", "nacl"]', { | 25 [ 'skia_freetype_static or skia_os in ["android", "nacl"]', { |
scroggo
2014/02/06 16:22:13
Would it make more sense to define skia_freetype_s
hal.canary
2014/02/06 18:01:57
Done.
| |
26 'dependencies': [ | 26 'dependencies': [ |
27 'freetype_static' | 27 'freetype_static' |
28 ], | 28 ], |
29 'export_dependent_settings': [ | 29 'export_dependent_settings': [ |
30 'freetype_static' | 30 'freetype_static' |
31 ], | 31 ], |
32 'direct_dependent_settings': { | 32 'direct_dependent_settings': { |
33 'defines': [ | 33 'defines': [ |
34 # Both Android and NaCl provide at least FreeType 2.4.0 | 34 # Both Android and NaCl provide at least FreeType 2.4.0 |
35 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', | 35 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
(...skipping 18 matching lines...) Expand all Loading... | |
54 ] | 54 ] |
55 }], | 55 }], |
56 ], | 56 ], |
57 }, | 57 }, |
58 { | 58 { |
59 'target_name': 'freetype_static', | 59 'target_name': 'freetype_static', |
60 'type': 'static_library', | 60 'type': 'static_library', |
61 'standalone_static_library': 1, | 61 'standalone_static_library': 1, |
62 'dependencies': [ | 62 'dependencies': [ |
63 # we are dependent upon PNG for color emoji glyphs | 63 # we are dependent upon PNG for color emoji glyphs |
64 'libpng.gyp:libpng', | |
djsollen
2014/02/06 16:24:34
I don't think you need this if your pulling in the
hal.canary
2014/02/06 18:01:57
Not the way I am doing it. The libpng target puts
| |
64 'images.gyp:images' | 65 'images.gyp:images' |
65 ], | 66 ], |
66 'includes': [ | 67 'includes': [ |
67 # common freetype sources needed for both the base Skia build and the | 68 # common freetype sources needed for both the base Skia build and the |
68 # libpoppler build for testing only | 69 # libpoppler build for testing only |
69 'freetype.gypi', | 70 'freetype.gypi', |
70 ], | 71 ], |
71 'include_dirs': [ | 72 'include_dirs': [ |
72 '../third_party/freetype/include_overrides', | 73 '../third_party/freetype/include_overrides', |
73 ], | 74 ], |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 '../third_party/externals/freetype/src/type1/type1.c', | 113 '../third_party/externals/freetype/src/type1/type1.c', |
113 '../third_party/externals/freetype/src/type42/type42.c', | 114 '../third_party/externals/freetype/src/type42/type42.c', |
114 '../third_party/externals/freetype/src/winfonts/winfnt.c', | 115 '../third_party/externals/freetype/src/winfonts/winfnt.c', |
115 | 116 |
116 '../third_party/externals/freetype/src/gzip/ftgzip.c', | 117 '../third_party/externals/freetype/src/gzip/ftgzip.c', |
117 '../third_party/externals/freetype/src/lzw/ftlzw.c', | 118 '../third_party/externals/freetype/src/lzw/ftlzw.c', |
118 ], | 119 ], |
119 }, | 120 }, |
120 ], | 121 ], |
121 } | 122 } |
OLD | NEW |