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

Side by Side Diff: ui/aura/aura.gyp

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 | « remoting/remoting.gyp ('k') | ui/ui.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 'window_tracker.cc', 97 'window_tracker.cc',
98 'window_tracker.h', 98 'window_tracker.h',
99 ], 99 ],
100 'conditions': [ 100 'conditions': [
101 ['OS=="mac"', { 101 ['OS=="mac"', {
102 'sources/': [ 102 'sources/': [
103 ['exclude', 'client/dispatcher_client.cc'], 103 ['exclude', 'client/dispatcher_client.cc'],
104 ['exclude', 'client/dispatcher_client.h'], 104 ['exclude', 'client/dispatcher_client.h'],
105 ], 105 ],
106 }], 106 }],
107 ['OS=="linux"', { 107 ['use_x11==1', {
108 'link_settings': { 108 'link_settings': {
109 'libraries': [ 109 'libraries': [
110 '-lX11', 110 '-lX11',
111 '-lXi', 111 '-lXi',
112 '-lXfixes', 112 '-lXfixes',
113 '-lXrandr', 113 '-lXrandr',
114 ], 114 ],
115 }, 115 },
116 }], 116 }],
117 ['OS=="win"', { 117 ['OS=="win"', {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 # osmesa GL implementation is used on linux. 272 # osmesa GL implementation is used on linux.
273 ['OS=="linux"', { 273 ['OS=="linux"', {
274 'dependencies': [ 274 'dependencies': [
275 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 275 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
276 ], 276 ],
277 }], 277 }],
278 ], 278 ],
279 }, 279 },
280 ], 280 ],
281 } 281 }
OLDNEW
« no previous file with comments | « remoting/remoting.gyp ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698