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

Side by Side Diff: remoting/remoting_host.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 | « media/media.gyp ('k') | ui/aura/aura.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 'includes': [ 6 'includes': [
7 'remoting_host_linux.gypi', 7 'remoting_host_linux.gypi',
8 'remoting_host_mac.gypi', 8 'remoting_host_mac.gypi',
9 'remoting_host_win.gypi', 9 'remoting_host_win.gypi',
10 ], 10 ],
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 'host/win/window_station_and_desktop.h', 246 'host/win/window_station_and_desktop.h',
247 'host/win/wts_terminal_monitor.cc', 247 'host/win/wts_terminal_monitor.cc',
248 'host/win/wts_terminal_monitor.h', 248 'host/win/wts_terminal_monitor.h',
249 'host/win/wts_terminal_observer.h', 249 'host/win/wts_terminal_observer.h',
250 ], 250 ],
251 'conditions': [ 251 'conditions': [
252 ['OS=="linux"', { 252 ['OS=="linux"', {
253 'dependencies': [ 253 'dependencies': [
254 # Always use GTK on Linux, even for Aura builds. 254 # Always use GTK on Linux, even for Aura builds.
255 '../build/linux/system.gyp:gtk', 255 '../build/linux/system.gyp:gtk',
256 '../build/linux/system.gyp:x11',
257 '../build/linux/system.gyp:xext',
258 '../build/linux/system.gyp:xfixes',
259 '../build/linux/system.gyp:xi',
260 '../build/linux/system.gyp:xrandr',
261 '../build/linux/system.gyp:xtst',
256 ], 262 ],
257 'link_settings': { 263 'link_settings': {
258 'libraries': [ 264 'libraries': [
259 '-lX11',
260 '-lXext',
261 '-lXfixes',
262 '-lXtst',
263 '-lXi',
264 '-lXrandr',
265 '-lpam', 265 '-lpam',
266 ], 266 ],
267 }, 267 },
268 }], 268 }],
269 ['OS=="mac"', { 269 ['OS=="mac"', {
270 'dependencies': [ 270 'dependencies': [
271 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac', 271 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac',
272 ], 272 ],
273 'link_settings': { 273 'link_settings': {
274 'libraries': [ 274 'libraries': [
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 '../base/allocator/allocator.gyp:allocator', 806 '../base/allocator/allocator.gyp:allocator',
807 ], 807 ],
808 }], 808 }],
809 ], 809 ],
810 }, # end of target 'remoting_me2me_native_messaging_host' 810 }, # end of target 'remoting_me2me_native_messaging_host'
811 ], # end of 'targets' 811 ], # end of 'targets'
812 }], # OS!="win" 812 }], # OS!="win"
813 813
814 ], # end of 'conditions' 814 ], # end of 'conditions'
815 } 815 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698