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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1244173005: Compile with VS2015. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | include/core/SkFloatingPoint.h » ('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 2015 Google Inc. 1 # Copyright 2015 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 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
(...skipping 28 matching lines...) Expand all
39 '-mfpmath=sse', 39 '-mfpmath=sse',
40 ], 40 ],
41 }], 41 }],
42 42
43 [ 'skia_os == "win"', 43 [ 'skia_os == "win"',
44 { 44 {
45 'defines': [ 45 'defines': [
46 'SK_BUILD_FOR_WIN32', 46 'SK_BUILD_FOR_WIN32',
47 '_CRT_SECURE_NO_WARNINGS', 47 '_CRT_SECURE_NO_WARNINGS',
48 'GR_GL_FUNCTION_TYPE=__stdcall', 48 'GR_GL_FUNCTION_TYPE=__stdcall',
49 '_HAS_EXCEPTIONS=0',
bungeman-skia 2015/07/21 21:07:27 This is used by the standard library, and seems li
49 ], 50 ],
50 'msvs_disabled_warnings': [ 51 'msvs_disabled_warnings': [
51 4275, # An exported class was derived from a class that was not exp orted 52 4275, # An exported class was derived from a class that was not exp orted
52 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too. 53 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too.
53 4355, # 'this' used in base member initializer list. Off by default in newer compilers. 54 4355, # 'this' used in base member initializer list. Off by default in newer compilers.
54 ], 55 ],
55 'msvs_cygwin_shell': 0, 56 'msvs_cygwin_shell': 0,
56 'msvs_settings': { 57 'msvs_settings': {
57 'VCCLCompilerTool': { 58 'VCCLCompilerTool': {
58 'WarningLevel': '3', 59 'WarningLevel': '3',
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 [ 'sknx_no_simd', { 632 [ 'sknx_no_simd', {
632 'defines': [ 'SKNX_NO_SIMD' ], 633 'defines': [ 'SKNX_NO_SIMD' ],
633 }], 634 }],
634 635
635 ], # end 'conditions' 636 ], # end 'conditions'
636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
637 'xcode_settings': { 638 'xcode_settings': {
638 'SYMROOT': '<(DEPTH)/xcodebuild', 639 'SYMROOT': '<(DEPTH)/xcodebuild',
639 }, 640 },
640 } 641 }
OLDNEW
« no previous file with comments | « no previous file | include/core/SkFloatingPoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698