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

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

Issue 1246863002: Enable MSVC warning C4018 for various directories that seem to pass as-is. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included 1 extra dir Created 5 years, 5 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 | « no previous file | net/third_party/nss/ssl.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': {
11 'msvs_disabled_warnings': [4005, 4013, 4018, 4101, 4716], 11 'msvs_disabled_warnings': [4005, 4013, 4101, 4716],
12 'include_dirs': [ 12 'include_dirs': [
13 '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data', 13 '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data',
14 '../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source', 14 '../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source',
15 ], 15 ],
16 }, 16 },
17 'targets': [ 17 'targets': [
18 { 18 {
19 'target_name': 'gles2_conform_test', 19 'target_name': 'gles2_conform_test',
20 'type': 'executable', 20 'type': 'executable',
21 'dependencies': [ 21 'dependencies': [
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 ['OS=="win"', { 127 ['OS=="win"', {
128 'dependencies': [ 128 'dependencies': [
129 '<(angle_path)/src/angle.gyp:libGLESv2', 129 '<(angle_path)/src/angle.gyp:libGLESv2',
130 '<(angle_path)/src/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
138 4101, # unreferenced local variable 137 4101, # unreferenced local variable
139 4715, # not all control paths return a value 138 4715, # not all control paths return a value
140 4267, # size_t/unsigned int conversion 139 4267, # size_t/unsigned int conversion
141 ], 140 ],
142 'defines!': [ 'NOMINMAX' ], 141 'defines!': [ 'NOMINMAX' ],
143 }], 142 }],
144 ['OS=="mac"', { 143 ['OS=="mac"', {
145 'defines': [ 144 'defines': [
146 '_STDINT', 145 '_STDINT',
147 '_STDINT_H', 146 '_STDINT_H',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 }], 250 }],
252 ], 251 ],
253 } 252 }
254 253
255 254
256 # Local Variables: 255 # Local Variables:
257 # tab-width:2 256 # tab-width:2
258 # indent-tabs-mode:nil 257 # indent-tabs-mode:nil
259 # End: 258 # End:
260 # vim: set expandtab tabstop=2 shiftwidth=2: 259 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | net/third_party/nss/ssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698