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

Side by Side Diff: build/linux/system.gyp

Issue 7983022: Reland 102005 and 102009: aura: Explicitly disable GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', 461 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
462 ], 462 ],
463 'libraries': [ 463 'libraries': [
464 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', 464 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
465 ], 465 ],
466 }, 466 },
467 }, 467 },
468 { 468 {
469 'target_name': 'glib', 469 'target_name': 'glib',
470 'type': 'settings', 470 'type': 'settings',
471 'direct_dependent_settings': { 471 'toolsets': ['host', 'target'],
472 'cflags': [ 472 'conditions': [
473 '<!@(<(pkg-config) --cflags glib-2.0)', 473 ['_toolset=="target"', {
474 ], 474 'direct_dependent_settings': {
475 }, 475 'cflags': [
476 'link_settings': { 476 '<!@(<(pkg-config) --cflags glib-2.0)',
477 'ldflags': [ 477 ],
478 '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)', 478 },
479 ], 479 'link_settings': {
480 'libraries': [ 480 'ldflags': [
481 '<!@(<(pkg-config) --libs-only-l glib-2.0)', 481 '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
482 ], 482 ],
483 }, 483 'libraries': [
484 '<!@(<(pkg-config) --libs-only-l glib-2.0)',
485 ],
486 },
487 }, {
488 'direct_dependent_settings': {
489 'cflags': [
490 '<!@(pkg-config --cflags glib-2.0)',
491 ],
492 },
493 'link_settings': {
494 'ldflags': [
495 '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0)',
496 ],
497 'libraries': [
498 '<!@(pkg-config --libs-only-l glib-2.0)',
499 ],
500 },
501 }],
502 ['chromeos==1', {
503 'link_settings': {
504 'libraries': [ '-lXtst' ]
505 }
506 }],
507 ],
484 }, 508 },
485 { 509 {
486 'target_name': 'libresolv', 510 'target_name': 'libresolv',
487 'type': 'settings', 511 'type': 'settings',
488 'link_settings': { 512 'link_settings': {
489 'libraries': [ 513 'libraries': [
490 '-lresolv', 514 '-lresolv',
491 ], 515 ],
492 }, 516 },
493 }, 517 },
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 ], 559 ],
536 'libraries': [ 560 'libraries': [
537 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)', 561 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)',
538 ], 562 ],
539 }, 563 },
540 }], 564 }],
541 ], 565 ],
542 }, 566 },
543 ], 567 ],
544 } 568 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698