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

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

Issue 14772009: Rationalize dependency on khronos EGL headers in place of angle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated khronos headers. Created 7 years, 7 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/gl/gl_context_egl.cc ('k') | no next file » | 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 'target_defaults': { 10 'target_defaults': {
11 'conditions': [ 11 'conditions': [
12 ['use_x11 == 1', { 12 ['use_x11 == 1', {
13 'include_dirs': [ 13 'include_dirs': [
14 '<(DEPTH)/third_party/angle/include', 14 '<(DEPTH)/third_party/khronos',
15 ], 15 ],
16 }], 16 }],
17 # TODO(ncarter): Does hlsl compilation belong in a shared location? 17 # TODO(ncarter): Does hlsl compilation belong in a shared location?
18 ['OS == "win"', { 18 ['OS == "win"', {
19 'include_dirs': [ 19 'include_dirs': [
20 '<(INTERMEDIATE_DIR)/hlsl', 20 '<(INTERMEDIATE_DIR)/hlsl',
21 ], 21 ],
22 'rules': [ 22 'rules': [
23 { 23 {
24 'variables': { 24 'variables': {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 'surface', 106 'surface',
107 ], 107 ],
108 'sources': [ 108 'sources': [
109 'accelerated_surface_transformer_win_unittest.cc', 109 'accelerated_surface_transformer_win_unittest.cc',
110 ], 110 ],
111 }, 111 },
112 ], 112 ],
113 }], 113 }],
114 ], 114 ],
115 } 115 }
OLDNEW
« no previous file with comments | « ui/gl/gl_context_egl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698