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

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

Issue 614053003: Replace build_angle.gyp with angle.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/command_buffer_service.gypi ('k') | gpu/gpu.gyp » ('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) 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 '-Wno-pointer-sign', 119 '-Wno-pointer-sign',
120 '-Wno-return-type', 120 '-Wno-return-type',
121 '-Wno-sizeof-pointer-memaccess', 121 '-Wno-sizeof-pointer-memaccess',
122 '-Wno-tautological-compare' 122 '-Wno-tautological-compare'
123 ] 123 ]
124 }] 124 }]
125 ], 125 ],
126 }], 126 }],
127 ['OS=="win"', { 127 ['OS=="win"', {
128 'dependencies': [ 128 'dependencies': [
129 '<(angle_path)/src/build_angle.gyp:libGLESv2', 129 '<(angle_path)/src/angle.gyp:libGLESv2',
130 '<(angle_path)/src/build_angle.gyp:libEGL', 130 '<(angle_path)/src/angle.gyp:libEGL',
131 ], 131 ],
132 'defines': [ 132 'defines': [
133 'EGLAPI=', 133 'EGLAPI=',
134 'EGLAPIENTRY=', 134 'EGLAPIENTRY=',
135 ], 135 ],
136 'msvs_disabled_warnings': [ 136 'msvs_disabled_warnings': [
137 4018, # signed/unsigned mismatch 137 4018, # signed/unsigned mismatch
138 4101, # unreferenced local variable 138 4101, # unreferenced local variable
139 4715, # not all control paths return a value 139 4715, # not all control paths return a value
140 ], 140 ],
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 }], # internal_gles2_conform_tests 203 }], # internal_gles2_conform_tests
204 ['OS=="win" and internal_gles2_conform_tests', { 204 ['OS=="win" and internal_gles2_conform_tests', {
205 'targets': [ 205 'targets': [
206 { 206 {
207 'target_name': 'gles2_conform_test_angle', 207 'target_name': 'gles2_conform_test_angle',
208 'type': 'executable', 208 'type': 'executable',
209 'dependencies': [ 209 'dependencies': [
210 'gles2_conform_test_embedded_data', 210 'gles2_conform_test_embedded_data',
211 '<(DEPTH)/base/base.gyp:base', 211 '<(DEPTH)/base/base.gyp:base',
212 '<(DEPTH)/third_party/expat/expat.gyp:expat', 212 '<(DEPTH)/third_party/expat/expat.gyp:expat',
213 '<(angle_path)/src/build_angle.gyp:libGLESv2', 213 '<(angle_path)/src/angle.gyp:libGLESv2',
214 '<(angle_path)/src/build_angle.gyp:libEGL', 214 '<(angle_path)/src/angle.gyp:libEGL',
215 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native', 215 '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_ma in_native',
216 ], 216 ],
217 'defines': [ 217 'defines': [
218 'GTF_API=GTF_GLES20', 218 'GTF_API=GTF_GLES20',
219 ], 219 ],
220 'include_dirs': [ 220 'include_dirs': [
221 '<(DEPTH)/third_party/angle_dx11/include', 221 '<(DEPTH)/third_party/angle_dx11/include',
222 ], 222 ],
223 'sources': [ 223 'sources': [
224 '<@(gtf_es_sources)', 224 '<@(gtf_es_sources)',
(...skipping 29 matching lines...) Expand all
254 }], 254 }],
255 ], 255 ],
256 } 256 }
257 257
258 258
259 # Local Variables: 259 # Local Variables:
260 # tab-width:2 260 # tab-width:2
261 # indent-tabs-mode:nil 261 # indent-tabs-mode:nil
262 # End: 262 # End:
263 # vim: set expandtab tabstop=2 shiftwidth=2: 263 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698