| 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 'EnableFiberSafeOptimizations': 'true', | 13 # The above is not sufficient (http://crbug.com/106711): it |
| 14 # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
| 15 # perform FPO regardless, so we must explicitly disable. |
| 16 # We still want the false setting above to avoid having |
| 17 # "/Oy /Oy-" and warnings about overriding. |
| 18 'AdditionalOptions': ['/Oy-'], |
| 13 }, | 19 }, |
| 14 'VCLibrarianTool': { | 20 'VCLibrarianTool': { |
| 15 'AdditionalOptions': [ | 21 'AdditionalOptions': [ |
| 16 '/ltcg', | 22 '/ltcg', |
| 17 '/expectedoutputsize:120000000' | 23 '/expectedoutputsize:120000000' |
| 18 ], | 24 ], |
| 19 }, | 25 }, |
| 20 'VCLinkerTool': { | 26 'VCLinkerTool': { |
| 21 'AdditionalOptions': [ | 27 'AdditionalOptions': [ |
| 22 '/time', | 28 '/time', |
| 23 # This may reduce memory fragmentation during linking. | 29 # This may reduce memory fragmentation during linking. |
| 24 # The expected size is 40*1024*1024, which gives us about 10M of | 30 # The expected size is 40*1024*1024, which gives us about 10M of |
| 25 # headroom as of Dec 16, 2011. | 31 # headroom as of Dec 16, 2011. |
| 26 '/expectedoutputsize:41943040', | 32 '/expectedoutputsize:41943040', |
| 27 ], | 33 ], |
| 28 'LinkTimeCodeGeneration': '1', | 34 'LinkTimeCodeGeneration': '1', |
| 29 # The /PROFILE flag causes the linker to add a "FIXUP" debug stream to | 35 # The /PROFILE flag causes the linker to add a "FIXUP" debug stream to |
| 30 # the generated PDB. According to MSDN documentation, this flag is only | 36 # the generated PDB. According to MSDN documentation, this flag is only |
| 31 # available (or perhaps supported) in the Enterprise (team development) | 37 # available (or perhaps supported) in the Enterprise (team development) |
| 32 # version of Visual Studio. If this blocks your official build, simply | 38 # version of Visual Studio. If this blocks your official build, simply |
| 33 # comment out this line, then re-run "gclient runhooks". | 39 # comment out this line, then re-run "gclient runhooks". |
| 34 'Profile': 'true', | 40 'Profile': 'true', |
| 35 }, | 41 }, |
| 36 }, | 42 }, |
| 37 } | 43 } |
| OLD | NEW |