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

Side by Side Diff: webkit/common/webkit_common.gyp

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 | « ui/views/views.gyp ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 6 'variables': {
7 'enable_wexit_time_destructors': 1, 7 'enable_wexit_time_destructors': 1,
8 'chromium_code': 1 8 'chromium_code': 1
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 ], 68 ],
69 'sources/': [['exclude', '_x11\\.cc$']], 69 'sources/': [['exclude', '_x11\\.cc$']],
70 }], 70 }],
71 ['use_aura==1', { 71 ['use_aura==1', {
72 'sources!': [ 72 'sources!': [
73 'cursors/webcursor_mac.mm', 73 'cursors/webcursor_mac.mm',
74 'cursors/webcursor_win.cc', 74 'cursors/webcursor_win.cc',
75 ], 75 ],
76 }], 76 }],
77 ['use_aura==1 and use_x11==1', { 77 ['use_aura==1 and use_x11==1', {
78 'link_settings': { 78 'dependencies': [
79 'libraries': [ '-lXcursor', ], 79 '<(DEPTH)/build/linux/system.gyp:xcursor',
80 }, 80 ],
81 }], 81 }],
82 ['use_ozone==0', { 82 ['use_ozone==0', {
83 'sources!': [ 83 'sources!': [
84 'cursors/webcursor_null.cc', 84 'cursors/webcursor_null.cc',
85 ], 85 ],
86 }], 86 }],
87 ['OS=="mac"', { 87 ['OS=="mac"', {
88 'link_settings': { 88 'link_settings': {
89 'libraries': [ 89 'libraries': [
90 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 90 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
91 ], 91 ],
92 }, 92 },
93 }], 93 }],
94 ['OS=="win"', { 94 ['OS=="win"', {
95 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 95 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
96 'msvs_disabled_warnings': [ 4800, 4267 ], 96 'msvs_disabled_warnings': [ 4800, 4267 ],
97 }], 97 }],
98 ], 98 ],
99 }, 99 },
100 ], 100 ],
101 } 101 }
OLDNEW
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698