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

Side by Side Diff: gyp/common_conditions.gypi

Issue 2205173003: Make SK_BUILD_FOR_WIN32 auto-detection work. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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 | « no previous file | include/core/SkPreConfig.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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 [ 'skia_arch_type == "x86"', { 58 [ 'skia_arch_type == "x86"', {
59 'cflags': [ 59 'cflags': [
60 '-msse2', 60 '-msse2',
61 '-mfpmath=sse', 61 '-mfpmath=sse',
62 ], 62 ],
63 }], 63 }],
64 64
65 [ 'skia_os == "win"', 65 [ 'skia_os == "win"',
66 { 66 {
67 'defines': [ 67 'defines': [
68 'SK_BUILD_FOR_WIN32',
69 '_CRT_SECURE_NO_WARNINGS', 68 '_CRT_SECURE_NO_WARNINGS',
70 'GR_GL_FUNCTION_TYPE=__stdcall', 69 'GR_GL_FUNCTION_TYPE=__stdcall',
71 '_HAS_EXCEPTIONS=0', 70 '_HAS_EXCEPTIONS=0',
72 'WIN32_LEAN_AND_MEAN', 71 'WIN32_LEAN_AND_MEAN',
73 'NOMINMAX', 72 'NOMINMAX',
74 ], 73 ],
75 'msvs_disabled_warnings': [ 74 'msvs_disabled_warnings': [
76 4275, # An exported class was derived from a class that was not exp orted 75 4275, # An exported class was derived from a class that was not exp orted
77 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too. 76 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too.
78 4355, # 'this' used in base member initializer list. Off by default in newer compilers. 77 4355, # 'this' used in base member initializer list. Off by default in newer compilers.
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], 703 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
705 }, 704 },
706 }], 705 }],
707 706
708 ], # end 'conditions' 707 ], # end 'conditions'
709 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 708 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
710 'xcode_settings': { 709 'xcode_settings': {
711 'SYMROOT': '<(DEPTH)/xcodebuild', 710 'SYMROOT': '<(DEPTH)/xcodebuild',
712 }, 711 },
713 } 712 }
OLDNEW
« no previous file with comments | « no previous file | include/core/SkPreConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698