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

Side by Side Diff: ui/gl/gl.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/aura/aura.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 9
10 'targets': [ 10 'targets': [
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 'defines': [ 206 'defines': [
207 'GL_GLEXT_PROTOTYPES', 207 'GL_GLEXT_PROTOTYPES',
208 ], 208 ],
209 }, 209 },
210 'link_settings': { 210 'link_settings': {
211 'libraries': [ 211 'libraries': [
212 '-lX11', 212 '-lX11',
213 '-lXcomposite', 213 '-lXcomposite',
214 ], 214 ],
215 }, 215 },
216 'dependencies': [
217 '<(DEPTH)/build/linux/system.gyp:x11',
218 '<(DEPTH)/build/linux/system.gyp:xcomposite',
219 '<(DEPTH)/build/linux/system.gyp:xext',
220 ],
216 }], 221 }],
217 ['OS=="win"', { 222 ['OS=="win"', {
218 'sources': [ 223 'sources': [
219 'gl_context_wgl.cc', 224 'gl_context_wgl.cc',
220 'gl_context_wgl.h', 225 'gl_context_wgl.h',
221 'gl_egl_api_implementation.cc', 226 'gl_egl_api_implementation.cc',
222 'gl_egl_api_implementation.h', 227 'gl_egl_api_implementation.h',
223 'gl_surface_wgl.cc', 228 'gl_surface_wgl.cc',
224 'gl_surface_wgl.h', 229 'gl_surface_wgl.h',
225 'gl_wgl_api_implementation.cc', 230 'gl_wgl_api_implementation.cc',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 'variables': { 354 'variables': {
350 'jni_gen_package': 'ui/gl', 355 'jni_gen_package': 'ui/gl',
351 'jni_generator_ptr_type': 'long', 356 'jni_generator_ptr_type': 'long',
352 }, 357 },
353 'includes': [ '../../build/jni_generator.gypi' ], 358 'includes': [ '../../build/jni_generator.gypi' ],
354 }, 359 },
355 ], 360 ],
356 }], 361 }],
357 ], 362 ],
358 } 363 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698