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

Side by Side Diff: gpu/gles2_conform_support/gles2_conform_test.gyp

Issue 101543007: Get rid of the old angle checkout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final Created 7 years 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 | « build/common.gypi ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 6
7 'includes': [ 7 'includes': [
8 'gles2_conform.gypi', 8 'gles2_conform.gypi',
9 ], 9 ],
10 'target_defaults': { 10 'target_defaults': {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_windowless', 103 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_windowless',
104 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck', 104 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck',
105 '<(DEPTH)/third_party/expat/expat.gyp:expat', 105 '<(DEPTH)/third_party/expat/expat.gyp:expat',
106 ], 106 ],
107 'conditions': [ 107 'conditions': [
108 ['OS=="linux"', { 108 ['OS=="linux"', {
109 'dependencies': ['../../build/linux/system.gyp:gtk'], 109 'dependencies': ['../../build/linux/system.gyp:gtk'],
110 }], 110 }],
111 ['OS=="win"', { 111 ['OS=="win"', {
112 'dependencies': [ 112 'dependencies': [
113 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:libGLESv2', 113 '<(angle_path)/src/build_angle.gyp:libGLESv2',
114 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:libEGL', 114 '<(angle_path)/src/build_angle.gyp:libEGL',
115 ], 115 ],
116 'defines': [ 116 'defines': [
117 'EGLAPI=', 117 'EGLAPI=',
118 'EGLAPIENTRY=', 118 'EGLAPIENTRY=',
119 ], 119 ],
120 'msvs_disabled_warnings': [ 120 'msvs_disabled_warnings': [
121 4018, # signed/unsigned mismatch 121 4018, # signed/unsigned mismatch
122 4101, # unreferenced local variable 122 4101, # unreferenced local variable
123 4715, # not all control paths return a value 123 4715, # not all control paths return a value
124 ], 124 ],
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 }], # internal_gles2_conform_tests 187 }], # internal_gles2_conform_tests
188 ['OS=="win" and internal_gles2_conform_tests', { 188 ['OS=="win" and internal_gles2_conform_tests', {
189 'targets': [ 189 'targets': [
190 { 190 {
191 'target_name': 'gles2_conform_test_angle', 191 'target_name': 'gles2_conform_test_angle',
192 'type': 'executable', 192 'type': 'executable',
193 'dependencies': [ 193 'dependencies': [
194 'gles2_conform_test_embedded_data', 194 'gles2_conform_test_embedded_data',
195 '<(DEPTH)/base/base.gyp:base', 195 '<(DEPTH)/base/base.gyp:base',
196 '<(DEPTH)/third_party/expat/expat.gyp:expat', 196 '<(DEPTH)/third_party/expat/expat.gyp:expat',
197 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:libGLESv2', 197 '<(angle_path)/src/build_angle.gyp:libGLESv2',
198 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:libEGL', 198 '<(angle_path)/src/build_angle.gyp:libEGL',
199 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native', 199 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native',
200 ], 200 ],
201 'defines': [ 201 'defines': [
202 'GTF_API=GTF_GLES20', 202 'GTF_API=GTF_GLES20',
203 ], 203 ],
204 'include_dirs': [ 204 'include_dirs': [
205 '<(DEPTH)/third_party/angle_dx11/include', 205 '<(DEPTH)/third_party/angle_dx11/include',
206 ], 206 ],
207 'sources': [ 207 'sources': [
208 '<@(gtf_es_sources)', 208 '<@(gtf_es_sources)',
(...skipping 30 matching lines...) Expand all
239 }], 239 }],
240 ], 240 ],
241 } 241 }
242 242
243 243
244 # Local Variables: 244 # Local Variables:
245 # tab-width:2 245 # tab-width:2
246 # indent-tabs-mode:nil 246 # indent-tabs-mode:nil
247 # End: 247 # End:
248 # vim: set expandtab tabstop=2 shiftwidth=2: 248 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698