Roll gyp and add librarian settings (now supported).

http://codereview.appspot.com/5169048/ git-svn-id: http://skia.googlecode.com/svn/trunk@2397 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-03 19:36:51 +00:00 · 2011-10-03 19:36:51 +00:00 · 983297e813
commit 983297e813
parent 5676b4a23a
2 changed files with 4 additions and 1 deletions
--- a/2
+++ b/2
@ -8,7 +8,7 @@ use_relative_paths = True
 # See third_party/externals/README
 #
 deps = {
-  "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@995",
+  "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1061",
 }

 #hooks = [
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@ -64,6 +64,9 @@
                'GenerateDebugInformation': 'true', # /DEBUG
                'LinkTimeCodeGeneration': '1',      # useLinkTimeCodeGeneration /LTCG
              },
+              'VCLibrarianTool': {
+                'LinkTimeCodeGeneration': 'true',   # useLinkTimeCodeGeneration /LTCG
+              },
            },
          },
        },