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

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

Issue 2085413002: gles2_conform: Fix sources list in GN/gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « gpu/gles2_conform_support/gles2_conform.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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 }], 175 }],
176 ], 176 ],
177 }], 177 }],
178 ], 178 ],
179 'defines': [ 179 'defines': [
180 'GTF_API=GTF_GLES20', 180 'GTF_API=GTF_GLES20',
181 'HKEMBEDDEDFILESYSTEM', 181 'HKEMBEDDEDFILESYSTEM',
182 ], 182 ],
183 'sources': [ 183 'sources': [
184 '<@(gtf_es_sources)', 184 '<@(gtf_es_sources)',
185 '<@(gl2_extension_test_sources)',
186 '<@(gl2_fixed_test_sources)',
187 '<@(gl2_test_sources)',
185 # Include a dummy c++ file to force linking of libstdc++. 188 # Include a dummy c++ file to force linking of libstdc++.
186 '<(DEPTH)/gpu/gles2_conform_support/dummy.cc', 189 '<(DEPTH)/gpu/gles2_conform_support/dummy.cc',
187 ], 190 ],
188 'run_as': { 191 'run_as': {
189 'conditions': [ 192 'conditions': [
190 ['OS=="win"', { 193 ['OS=="win"', {
191 'action': [ 194 'action': [
192 '$(TargetPath)', 195 '$(TargetPath)',
193 '-noimagefileio', 196 '-noimagefileio',
194 '-run=<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/mustp ass.run', 197 '-run=<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/mustp ass.run',
(...skipping 18 matching lines...) Expand all
213 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native', 216 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native',
214 ], 217 ],
215 'defines': [ 218 'defines': [
216 'GTF_API=GTF_GLES20', 219 'GTF_API=GTF_GLES20',
217 ], 220 ],
218 'include_dirs': [ 221 'include_dirs': [
219 '<(DEPTH)/third_party/angle_dx11/include', 222 '<(DEPTH)/third_party/angle_dx11/include',
220 ], 223 ],
221 'sources': [ 224 'sources': [
222 '<@(gtf_es_sources)', 225 '<@(gtf_es_sources)',
226 '<@(gl2_extension_test_sources)',
227 '<@(gl2_fixed_test_sources)',
228 '<@(gl2_test_sources)',
223 ], 229 ],
224 }, 230 },
225 ], 231 ],
226 }], 232 }],
227 233
228 ['chromeos==1 and internal_gles2_conform_tests', { 234 ['chromeos==1 and internal_gles2_conform_tests', {
229 'targets': [ 235 'targets': [
230 { 236 {
231 'target_name': 'gles2_conform_test_chromeos', 237 'target_name': 'gles2_conform_test_chromeos',
232 'type': 'executable', 238 'type': 'executable',
233 'dependencies': [ 239 'dependencies': [
234 'gles2_conform_test_embedded_data', 240 'gles2_conform_test_embedded_data',
235 '<(DEPTH)/base/base.gyp:*', 241 '<(DEPTH)/base/base.gyp:*',
236 '<(DEPTH)/third_party/expat/expat.gyp:expat', 242 '<(DEPTH)/third_party/expat/expat.gyp:expat',
237 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native', 243 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native',
238 ], 244 ],
239 'libraries': [ 245 'libraries': [
240 '-lEGL', 246 '-lEGL',
241 '-lGLESv2', 247 '-lGLESv2',
242 ], 248 ],
243 'defines': [ 249 'defines': [
244 'GTF_API=GTF_GLES20', 250 'GTF_API=GTF_GLES20',
245 'CHROMEOS_GLES2_CONFORMANCE', 251 'CHROMEOS_GLES2_CONFORMANCE',
246 ], 252 ],
247 'sources': [ 253 'sources': [
248 '<@(gtf_es_sources)', 254 '<@(gtf_es_sources)',
255 '<@(gl2_extension_test_sources)',
256 '<@(gl2_fixed_test_sources)',
257 '<@(gl2_test_sources)',
249 ], 258 ],
250 }, 259 },
251 ], 260 ],
252 }], 261 }],
253 ], 262 ],
254 } 263 }
255 264
256 265
257 # Local Variables: 266 # Local Variables:
258 # tab-width:2 267 # tab-width:2
259 # indent-tabs-mode:nil 268 # indent-tabs-mode:nil
260 # End: 269 # End:
261 # vim: set expandtab tabstop=2 shiftwidth=2: 270 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698