Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
| index ed54a58feb23eaa83fc5fd8f942c4647eeb42396..17eeb78ec51368049bc9908676a34d1bb35ffb94 100644 |
| --- a/gyp/common_conditions.gypi |
| +++ b/gyp/common_conditions.gypi |
| @@ -86,7 +86,6 @@ |
| 'VCCLCompilerTool': { |
| 'DebugInformationFormat': '3', # programDatabase (/Zi) |
| 'Optimization': '<(skia_release_optimization_level)', |
| - 'WholeProgramOptimization': 'true', #/GL |
| # Changing the floating point model requires rebaseling gm images |
| #'FloatingPointModel': '2', # fast (/fp:fast) |
| 'FavorSizeOrSpeed': '1', # speed (/Ot) |
| @@ -97,10 +96,6 @@ |
| }, |
| 'VCLinkerTool': { |
| 'GenerateDebugInformation': 'true', # /DEBUG |
| - 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG |
| - }, |
| - 'VCLibrarianTool': { |
| - 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG |
| }, |
| }, |
| }, |
| @@ -154,6 +149,23 @@ |
| }, |
| }, |
| }], |
| + [ 'skia_win_ltcg', { |
|
mtklein
2014/06/26 19:00:50
Even skia_ltcg or just ltcg? I'm not really sure
|
| + 'configurations': { |
| + 'Release': { |
| + 'msvs_settings': { |
| + 'VCCLCompilerTool': { |
| + 'WholeProgramOptimization': 'true', #/GL |
| + }, |
| + 'VCLinkerTool': { |
| + 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG |
| + }, |
| + 'VCLibrarianTool': { |
| + 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG |
| + }, |
| + }, |
| + }, |
| + }, |
| + }], |
| ], |
| }, |
| ], |