commit d971869b3a4dcdbfa341e243ef163fb0758f2d23
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 22 14:56:50 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 22 14:56:50 2013 +0000
tree 467430d07463a984bbcab7b2e1b8a1cf23f20841
parent aa2c2ffe5ad006cdee376e9c6850f615eac13b4d

Revert accidentally changed msvs settings in r8764.



git-svn-id: http://skia.googlecode.com/svn/trunk@8800 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 3ebe8eb..feb364f 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -62,7 +62,7 @@
               'VCCLCompilerTool': {
                 'DebugInformationFormat': '3',      # programDatabase (/Zi)
                 'Optimization': '3',                # full (/Ox)
-#'WholeProgramOptimization': 'true', #/GL
+                'WholeProgramOptimization': 'true', #/GL
                # Changing the floating point model requires rebaseling gm images
                #'FloatingPointModel': '2',          # fast (/fp:fast)
                 'FavorSizeOrSpeed': '1',            # speed (/Ot)
@@ -73,10 +73,10 @@
               },
               'VCLinkerTool': {
                 'GenerateDebugInformation': 'true', # /DEBUG
-#'LinkTimeCodeGeneration': '1',      # useLinkTimeCodeGeneration /LTCG
+                'LinkTimeCodeGeneration': '1',      # useLinkTimeCodeGeneration /LTCG
               },
               'VCLibrarianTool': {
-#                'LinkTimeCodeGeneration': 'true',   # useLinkTimeCodeGeneration /LTCG
+                'LinkTimeCodeGeneration': 'true',   # useLinkTimeCodeGeneration /LTCG
               },
             },
           },