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

Side by Side Diff: ui/ui.gyp

Issue 23536057: linux_aura: Implement most of DesktopScreenX11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix chromeos compile. Created 7 years, 3 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
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 'includes': [ 9 'includes': [
10 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 ['use_x11==1', { 847 ['use_x11==1', {
848 'all_dependent_settings': { 848 'all_dependent_settings': {
849 'ldflags': [ 849 'ldflags': [
850 '-L<(PRODUCT_DIR)', 850 '-L<(PRODUCT_DIR)',
851 ], 851 ],
852 'link_settings': { 852 'link_settings': {
853 'libraries': [ 853 'libraries': [
854 '-lX11', 854 '-lX11',
855 '-lXcursor', 855 '-lXcursor',
856 '-lXrender', # For XRender* function calls in x11_util.cc. 856 '-lXrender', # For XRender* function calls in x11_util.cc.
857 '-lXrandr',
857 ], 858 ],
858 }, 859 },
859 }, 860 },
860 'link_settings': { 861 'link_settings': {
861 'libraries': [ 862 'libraries': [
862 '-lX11', 863 '-lX11',
863 '-lXcursor', 864 '-lXcursor',
864 '-lXrender', # For XRender* function calls in x11_util.cc. 865 '-lXrender', # For XRender* function calls in x11_util.cc.
866 '-lXrandr',
865 ], 867 ],
866 }, 868 },
867 'dependencies': [ 869 'dependencies': [
868 '../build/linux/system.gyp:x11', 870 '../build/linux/system.gyp:x11',
869 '../build/linux/system.gyp:xext', 871 '../build/linux/system.gyp:xext',
870 '../build/linux/system.gyp:xfixes', 872 '../build/linux/system.gyp:xfixes',
871 ], 873 ],
872 }, { # use_x11==0 874 }, { # use_x11==0
873 'sources/': [ 875 'sources/': [
874 ['exclude', 'events/keycodes/keyboard_code_conversion_x.*'], 876 ['exclude', 'events/keycodes/keyboard_code_conversion_x.*'],
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 'xcode_settings': { 1085 'xcode_settings': {
1084 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 1086 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
1085 }, 1087 },
1086 }], 1088 }],
1087 ], 1089 ],
1088 }, 1090 },
1089 ], 1091 ],
1090 }], 1092 }],
1091 ], 1093 ],
1092 } 1094 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698