| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'includes': ['release_defaults.gypi'], | 5 'includes': ['release_defaults.gypi'], |
| 6 'defines': ['OFFICIAL_BUILD'], | 6 'defines': ['OFFICIAL_BUILD'], |
| 7 'msvs_settings': { | 7 'msvs_settings': { |
| 8 'VCCLCompilerTool': { | 8 'VCCLCompilerTool': { |
| 9 'InlineFunctionExpansion': '2', | 9 'InlineFunctionExpansion': '2', |
| 10 'EnableIntrinsicFunctions': 'true', | 10 'EnableIntrinsicFunctions': 'true', |
| 11 'EnableFiberSafeOptimizations': 'true', | |
| 12 'OmitFramePointers': 'false', | 11 'OmitFramePointers': 'false', |
| 13 # The above is not sufficient (http://crbug.com/106711): it | 12 # The above is not sufficient (http://crbug.com/106711): it |
| 14 # simply eliminates an explicit "/Oy", but both /O2 and /Ox | 13 # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
| 15 # perform FPO regardless, so we must explicitly disable. | 14 # perform FPO regardless, so we must explicitly disable. |
| 16 # We still want the false setting above to avoid having | 15 # We still want the false setting above to avoid having |
| 17 # "/Oy /Oy-" and warnings about overriding. | 16 # "/Oy /Oy-" and warnings about overriding. |
| 18 'AdditionalOptions': ['/Oy-'], | 17 'AdditionalOptions': ['/Oy-'], |
| 19 }, | 18 }, |
| 20 'VCLibrarianTool': { | 19 'VCLibrarianTool': { |
| 21 'AdditionalOptions': [ | 20 'AdditionalOptions': [ |
| (...skipping 11 matching lines...) Expand all Loading... |
| 33 ], | 32 ], |
| 34 # The /PROFILE flag causes the linker to add a "FIXUP" debug stream to | 33 # The /PROFILE flag causes the linker to add a "FIXUP" debug stream to |
| 35 # the generated PDB. According to MSDN documentation, this flag is only | 34 # the generated PDB. According to MSDN documentation, this flag is only |
| 36 # available (or perhaps supported) in the Enterprise (team development) | 35 # available (or perhaps supported) in the Enterprise (team development) |
| 37 # version of Visual Studio. If this blocks your official build, simply | 36 # version of Visual Studio. If this blocks your official build, simply |
| 38 # comment out this line, then re-run "gclient runhooks". | 37 # comment out this line, then re-run "gclient runhooks". |
| 39 'Profile': 'true', | 38 'Profile': 'true', |
| 40 }, | 39 }, |
| 41 }, | 40 }, |
| 42 } | 41 } |
| OLD | NEW |