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

Side by Side Diff: content/content_plugin.gypi

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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 | « content/content_browser.gypi ('k') | media/media.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 # 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 ['enable_plugins==1', { 7 ['enable_plugins==1', {
8 'dependencies': [ 8 'dependencies': [
9 '../skia/skia.gyp:skia', 9 '../skia/skia.gyp:skia',
10 '../third_party/npapi/npapi.gyp:npapi', 10 '../third_party/npapi/npapi.gyp:npapi',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ['toolkit_uses_gtk == 1', { 49 ['toolkit_uses_gtk == 1', {
50 'dependencies': [ 50 'dependencies': [
51 '../build/linux/system.gyp:gtk', 51 '../build/linux/system.gyp:gtk',
52 ], 52 ],
53 'link_settings': { 53 'link_settings': {
54 'libraries': [ 54 'libraries': [
55 '-lXext', 55 '-lXext',
56 ], 56 ],
57 }, 57 },
58 }], 58 }],
59 ['use_aura==1 and OS!="win"', { 59 ['use_x11 == 1', {
60 'link_settings': { 60 'link_settings': {
61 'libraries': [ 61 'libraries': [
62 '-lXext', 62 '-lXext',
63 ], 63 ],
64 }, 64 },
65 }], 65 }],
66 ], 66 ],
67 }], 67 }],
68 ], 68 ],
69 } 69 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698