| OLD | NEW |
| 1 # Copyright 2009 The Chromium Authors. All rights reserved. | 1 # Copyright 2009 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 'variables': { | 6 'variables': { |
| 7 'variables': { | 7 'variables': { |
| 8 'clang%': 0, | 8 'clang%': 0, |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['OS=="mac"', { | 10 ['OS=="mac"', { |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 }, | 173 }, |
| 174 'msvs_settings': { | 174 'msvs_settings': { |
| 175 'VCCLCompilerTool': { | 175 'VCCLCompilerTool': { |
| 176 'WarningLevel': '4', | 176 'WarningLevel': '4', |
| 177 'WarnAsError': 'true', | 177 'WarnAsError': 'true', |
| 178 'DebugInformationFormat': '3', | 178 'DebugInformationFormat': '3', |
| 179 'ExceptionHandling': '0', | 179 'ExceptionHandling': '0', |
| 180 'RuntimeTypeInfo': 'false', | 180 'RuntimeTypeInfo': 'false', |
| 181 'BufferSecurityCheck': 'true', | 181 'BufferSecurityCheck': 'true', |
| 182 'EnableFunctionLevelLinking': 'true', | 182 'EnableFunctionLevelLinking': 'true', |
| 183 'OmitFramePointers': 'false', |
| 184 # The above is not sufficient (http://crbug.com/106711): it simply |
| 185 # eliminates an explicit "/Oy", but both /O2 and /Ox perform FPO |
| 186 # regardless, so we must explicitly disable. We still want the false |
| 187 # setting above to avoid having "/Oy /Oy-" and warnings about |
| 188 # overriding. |
| 189 'AdditionalOptions': ['/Oy-'], |
| 183 }, | 190 }, |
| 184 'VCLinkerTool': { | 191 'VCLinkerTool': { |
| 185 'GenerateDebugInformation': 'true', | 192 'GenerateDebugInformation': 'true', |
| 186 'SubSystem': '1', | 193 'SubSystem': '1', |
| 187 }, | 194 }, |
| 188 }, | 195 }, |
| 189 'msvs_disabled_warnings': [ | 196 'msvs_disabled_warnings': [ |
| 190 4100, # Unreferenced formal parameter. | 197 4100, # Unreferenced formal parameter. |
| 191 4127, # Conditional expression is constant. | 198 4127, # Conditional expression is constant. |
| 192 4201, # Nonstandard extension used : nameless struct/union. | 199 4201, # Nonstandard extension used : nameless struct/union. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 ], | 285 ], |
| 279 }], | 286 }], |
| 280 ], | 287 ], |
| 281 | 288 |
| 282 }], | 289 }], |
| 283 | 290 |
| 284 ['OS=="win"', { | 291 ['OS=="win"', { |
| 285 'msvs_settings': { | 292 'msvs_settings': { |
| 286 'VCCLCompilerTool': { | 293 'VCCLCompilerTool': { |
| 287 'Optimization': '3', | 294 'Optimization': '3', |
| 295 'AdditionalOptions': [ |
| 296 '/Zo', # Improve debugging optimized builds. |
| 297 ], |
| 288 }, | 298 }, |
| 289 }, | 299 }, |
| 290 }], | 300 }], |
| 291 | 301 |
| 292 ], | 302 ], |
| 293 }, | 303 }, |
| 294 'Debug': { | 304 'Debug': { |
| 295 'conditions': [ | 305 'conditions': [ |
| 296 | 306 |
| 297 ['OS=="mac"', { | 307 ['OS=="mac"', { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 }, | 344 }, |
| 335 | 345 |
| 336 'conditions': [ | 346 'conditions': [ |
| 337 ['OS=="mac"', { | 347 ['OS=="mac"', { |
| 338 'xcode_settings': { | 348 'xcode_settings': { |
| 339 'SYMROOT': '<(DEPTH)/xcodebuild', | 349 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 340 }, | 350 }, |
| 341 }], | 351 }], |
| 342 ], | 352 ], |
| 343 } | 353 } |
| OLD | NEW |