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

Side by Side Diff: gyp/common_conditions.gypi

Issue 728633002: Don't use /ZI on 64 bit windows (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 # We handle the 64- vs 32-bit variations elsewhere, so I think it's 122 # We handle the 64- vs 32-bit variations elsewhere, so I think it's
123 # OK for us to just make these inherit non-archwidth-specific 123 # OK for us to just make these inherit non-archwidth-specific
124 # configurations without modification. 124 # configurations without modification.
125 # 125 #
126 # See http://skbug.com/2442 : These targets cause problems in the 126 # See http://skbug.com/2442 : These targets cause problems in the
127 # MSVS build, so only include them if gyp is generating a ninja build. 127 # MSVS build, so only include them if gyp is generating a ninja build.
128 [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', { 128 [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', {
129 'configurations': { 129 'configurations': {
130 'Debug_x64': { 130 'Debug_x64': {
131 'inherit_from': ['Debug'], 131 'inherit_from': ['Debug'],
132 'msvs_settings': {
133 'VCCLCompilerTool': {
134 # /ZI is not supported on 64bit
135 'DebugInformationFormat': '3', # programDatabase (/Zi)
136 },
137 },
132 }, 138 },
133 'Release_x64': { 139 'Release_x64': {
134 'inherit_from': ['Release'], 140 'inherit_from': ['Release'],
135 }, 141 },
136 'Release_Developer_x64': { 142 'Release_Developer_x64': {
137 'inherit_from': ['Release_Developer'], 143 'inherit_from': ['Release_Developer'],
138 }, 144 },
139 }, 145 },
140 }], 146 }],
141 [ 'skia_arch_width == 64', { 147 [ 'skia_arch_width == 64', {
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 [ 'skia_is_bot', { 637 [ 'skia_is_bot', {
632 'defines': [ 'SK_CRASH_HANDLER' ], 638 'defines': [ 'SK_CRASH_HANDLER' ],
633 }], 639 }],
634 640
635 ], # end 'conditions' 641 ], # end 'conditions'
636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 642 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
637 'xcode_settings': { 643 'xcode_settings': {
638 'SYMROOT': '<(DEPTH)/xcodebuild', 644 'SYMROOT': '<(DEPTH)/xcodebuild',
639 }, 645 },
640 } 646 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698