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

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

Issue 56833002: Add a basic NativeViewportMac for Mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address ben's feedback Created 7 years, 1 month 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 | « mojo/services/native_viewport/native_viewport_mac.mm ('k') | ui/gl/gl_context_mac.mm » ('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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 '-ldwmapi.lib', 249 '-ldwmapi.lib',
250 ], 250 ],
251 }, 251 },
252 }], 252 }],
253 ['OS=="mac"', { 253 ['OS=="mac"', {
254 'sources': [ 254 'sources': [
255 'gl_context_cgl.cc', 255 'gl_context_cgl.cc',
256 'gl_context_cgl.h', 256 'gl_context_cgl.h',
257 'gl_surface_cgl.cc', 257 'gl_surface_cgl.cc',
258 'gl_surface_cgl.h', 258 'gl_surface_cgl.h',
259 'gl_context_nsview.mm',
260 'gl_context_nsview.h',
261 'gl_surface_nsview.mm',
262 'gl_surface_nsview.h',
259 ], 263 ],
260 'link_settings': { 264 'link_settings': {
261 'libraries': [ 265 'libraries': [
262 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 266 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
263 ], 267 ],
264 }, 268 },
265 }], 269 }],
266 ['OS=="mac" and use_aura == 1', {
267 'sources': [
268 'gl_context_nsview.mm',
269 'gl_context_nsview.h',
270 'gl_surface_nsview.mm',
271 'gl_surface_nsview.h',
272 ],
273 }],
274 ['OS=="android"', { 270 ['OS=="android"', {
275 'dependencies': [ 271 'dependencies': [
276 'gl_jni_headers', 272 'gl_jni_headers',
277 ], 273 ],
278 'sources': [ 274 'sources': [
279 'gl_image_egl.cc', 275 'gl_image_egl.cc',
280 'gl_image_egl.h', 276 'gl_image_egl.h',
281 ], 277 ],
282 'link_settings': { 278 'link_settings': {
283 'libraries': [ 279 'libraries': [
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 ], 350 ],
355 'variables': { 351 'variables': {
356 'jni_gen_package': 'ui/gl', 352 'jni_gen_package': 'ui/gl',
357 }, 353 },
358 'includes': [ '../../build/jni_generator.gypi' ], 354 'includes': [ '../../build/jni_generator.gypi' ],
359 }, 355 },
360 ], 356 ],
361 }], 357 }],
362 ], 358 ],
363 } 359 }
OLDNEW
« no previous file with comments | « mojo/services/native_viewport/native_viewport_mac.mm ('k') | ui/gl/gl_context_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698