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

Side by Side Diff: gyp/zlib.gyp

Issue 1276133002: Fix warnings on VS2015 x86_64 build (Closed) Base URL: https://skia.googlesource.com/skia.git@didSetPipeline
Patch Set: tabs- Created 5 years, 4 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 | « gm/lightingshader.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('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 2014 Google Inc. 1 # Copyright 2014 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': {
8 'skia_warnings_as_errors': 0,
9 },
7 'targets': [ 10 'targets': [
8 { 11 {
9 # Only used by win, down below. 12 # Only used by win, down below.
10 'target_name' : 'zlib_x86_simd', 13 'target_name' : 'zlib_x86_simd',
11 'type': 'static_library', 14 'type': 'static_library',
12 'cflags' : ['-msse4.2', '-mpclmul'], 15 'cflags' : ['-msse4.2', '-mpclmul'],
13 'sources' : [ 16 'sources' : [
14 '../third_party/externals/zlib/crc_folding.c', 17 '../third_party/externals/zlib/crc_folding.c',
15 '../third_party/externals/zlib/fill_window_sse.c', 18 '../third_party/externals/zlib/fill_window_sse.c',
16 ], 19 ],
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 'dependencies': [ 89 'dependencies': [
87 'zlib_x86_simd', 90 'zlib_x86_simd',
88 ], 91 ],
89 'defines': [ 92 'defines': [
90 '_CRT_NONSTDC_NO_DEPRECATE', 93 '_CRT_NONSTDC_NO_DEPRECATE',
91 ], 94 ],
92 }], 95 }],
93 ], 96 ],
94 }], 97 }],
95 } 98 }
OLDNEW
« no previous file with comments | « gm/lightingshader.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698