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

Side by Side Diff: content/content_plugin.gypi

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback, try to fix cros_x86 gyp error Created 6 years, 10 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_common.gypi ('k') | media/cast/cast.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/WebKit/public/blink.gyp:blink', 10 '../third_party/WebKit/public/blink.gyp:blink',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 }], 43 }],
44 ['OS=="win"', { 44 ['OS=="win"', {
45 'include_dirs': [ 45 'include_dirs': [
46 '<(DEPTH)/third_party/wtl/include', 46 '<(DEPTH)/third_party/wtl/include',
47 ], 47 ],
48 }], 48 }],
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': {
54 'libraries': [
55 '-lXext',
56 ],
57 },
58 }], 53 }],
59 ['use_x11 == 1', { 54 ['use_x11 == 1', {
60 'link_settings': { 55 'dependencies': [
61 'libraries': [ 56 '../build/linux/system.gyp:xext',
62 '-lXext', 57 ],
63 ],
64 },
65 }], 58 }],
66 ], 59 ],
67 }], 60 }],
68 ], 61 ],
69 } 62 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | media/cast/cast.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698