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

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

Issue 4894001: Revert 65938 (arm compile fail) - touchui: First pass at XInput2 message pump... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 | « base/message_pump_glib_x.cc ('k') | views/event_x.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ], 218 ],
219 }, 219 },
220 'link_settings': { 220 'link_settings': {
221 'ldflags': [ 221 'ldflags': [
222 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11)', 222 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11)',
223 ], 223 ],
224 'libraries': [ 224 'libraries': [
225 '<!@(<(pkg-config) --libs-only-l x11)', 225 '<!@(<(pkg-config) --libs-only-l x11)',
226 ], 226 ],
227 }, 227 },
228 }], 228 }]]
229 # When XInput2 is available (i.e. inputproto version is 2.0), the
230 # pkg-config command will succeed, so the output will be empty.
231 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
232 'direct_dependent_settings': {
233 'defines': [
234 'HAVE_XINPUT2',
235 ],
236 },
237 }],
238 ],
239 }, 229 },
240 { 230 {
241 'target_name': 'xext', 231 'target_name': 'xext',
242 'type': 'settings', 232 'type': 'settings',
243 'conditions': [ 233 'conditions': [
244 ['_toolset=="target"', { 234 ['_toolset=="target"', {
245 'direct_dependent_settings': { 235 'direct_dependent_settings': {
246 'cflags': [ 236 'cflags': [
247 '<!@(<(pkg-config) --cflags xext)', 237 '<!@(<(pkg-config) --cflags xext)',
248 ], 238 ],
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 ], 348 ],
359 }, 349 },
360 ], 350 ],
361 } 351 }
362 352
363 # Local Variables: 353 # Local Variables:
364 # tab-width:2 354 # tab-width:2
365 # indent-tabs-mode:nil 355 # indent-tabs-mode:nil
366 # End: 356 # End:
367 # vim: set expandtab tabstop=2 shiftwidth=2: 357 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « base/message_pump_glib_x.cc ('k') | views/event_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698