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

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

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 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
« no previous file with comments | « ui/gl/angle_platform_impl.cc ('k') | ui/gl/gl_image_glx.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) 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 'dependencies': [ 179 'dependencies': [
180 '<(DEPTH)/build/linux/system.gyp:x11', 180 '<(DEPTH)/build/linux/system.gyp:x11',
181 '<(DEPTH)/build/linux/system.gyp:xcomposite', 181 '<(DEPTH)/build/linux/system.gyp:xcomposite',
182 '<(DEPTH)/build/linux/system.gyp:xext', 182 '<(DEPTH)/build/linux/system.gyp:xext',
183 '<(DEPTH)/ui/events/platform/events_platform.gyp:events_platform', 183 '<(DEPTH)/ui/events/platform/events_platform.gyp:events_platform',
184 '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11', 184 '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11',
185 ], 185 ],
186 }], 186 }],
187 ['OS=="win"', { 187 ['OS=="win"', {
188 'sources': [ 188 'sources': [
189 'angle_platform_impl.cc',
190 'angle_platform_impl.h',
189 'gl_bindings_autogen_wgl.cc', 191 'gl_bindings_autogen_wgl.cc',
190 'gl_bindings_autogen_wgl.h', 192 'gl_bindings_autogen_wgl.h',
191 'gl_context_wgl.cc', 193 'gl_context_wgl.cc',
192 'gl_context_wgl.h', 194 'gl_context_wgl.h',
193 'gl_egl_api_implementation.cc', 195 'gl_egl_api_implementation.cc',
194 'gl_egl_api_implementation.h', 196 'gl_egl_api_implementation.h',
195 'gl_surface_wgl.cc', 197 'gl_surface_wgl.cc',
196 'gl_surface_wgl.h', 198 'gl_surface_wgl.h',
197 'gl_wgl_api_implementation.cc', 199 'gl_wgl_api_implementation.cc',
198 'gl_wgl_api_implementation.h', 200 'gl_wgl_api_implementation.h',
199 ], 201 ],
202 'dependencies': [
203 # TODO(jmadill): Use ANGLE on other platforms.
204 '<(angle_path)/src/angle.gyp:libEGL',
205 '<(angle_path)/src/angle.gyp:libGLESv2',
206 ],
200 'msvs_settings': { 207 'msvs_settings': {
201 'VCLinkerTool': { 208 'VCLinkerTool': {
202 'DelayLoadDLLs': [ 209 'DelayLoadDLLs': [
203 'dwmapi.dll', 210 'dwmapi.dll',
204 ], 211 ],
205 'AdditionalDependencies': [ 212 'AdditionalDependencies': [
206 'dwmapi.lib', 213 'dwmapi.lib',
207 ], 214 ],
208 }, 215 },
209 }, 216 },
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 ], 319 ],
313 'variables': { 320 'variables': {
314 'jni_gen_package': 'ui/gl', 321 'jni_gen_package': 'ui/gl',
315 }, 322 },
316 'includes': [ '../../build/jni_generator.gypi' ], 323 'includes': [ '../../build/jni_generator.gypi' ],
317 }, 324 },
318 ], 325 ],
319 }], 326 }],
320 ], 327 ],
321 } 328 }
OLDNEW
« no previous file with comments | « ui/gl/angle_platform_impl.cc ('k') | ui/gl/gl_image_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698