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