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

Side by Side Diff: gyp/common_conditions.gypi

Issue 19835002: refactor gyp to isolate freetype usage (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase 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
« no previous file with comments | « no previous file | gyp/core.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'SK_BUILD_FOR_NACL', 233 'SK_BUILD_FOR_NACL',
234 ], 234 ],
235 'link_settings': { 235 'link_settings': {
236 'libraries': [ 236 'libraries': [
237 '-lppapi', 237 '-lppapi',
238 '-lppapi_cpp', 238 '-lppapi_cpp',
239 '-lnosys', 239 '-lnosys',
240 '-pthread', 240 '-pthread',
241 ], 241 ],
242 }, 242 },
243 }, { # skia_os != "nacl"
244 'include_dirs' : [
245 '/usr/include/freetype2',
246 ],
247 }], 243 }],
248 [ 'skia_os == "chromeos"', { 244 [ 'skia_os == "chromeos"', {
249 'ldflags': [ 245 'ldflags': [
250 '-lstdc++', 246 '-lstdc++',
251 '-lm', 247 '-lm',
252 ], 248 ],
253 }, { 249 }, {
254 'conditions': [ 250 'conditions': [
255 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 251 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
256 'cflags': [ 252 'cflags': [
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 'xcode_settings': { 460 'xcode_settings': {
465 'SYMROOT': '<(DEPTH)/xcodebuild', 461 'SYMROOT': '<(DEPTH)/xcodebuild',
466 }, 462 },
467 } 463 }
468 464
469 # Local Variables: 465 # Local Variables:
470 # tab-width:2 466 # tab-width:2
471 # indent-tabs-mode:nil 467 # indent-tabs-mode:nil
472 # End: 468 # End:
473 # vim: set expandtab tabstop=2 shiftwidth=2: 469 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | gyp/core.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698