From 14fcb33aee8aa0371677a094e8eb1829fefda4a5 Mon Sep 17 00:00:00 2001 From: "shannon.woods@transgaming.com" Date: Fri, 25 Jan 2013 21:56:40 +0000 Subject: [PATCH] Roll gyp dependency to 1564. This is to fix the standalone gyp build. It couldn't handle changes made in r1721. This is the latest version. Review URL: https://codereview.appspot.com/7204049 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1792 736b8ea6-26fd-11df-bfd4-992fa37f6226 --- DEPS | 2 +- build/common.gypi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 3f96d9a61..1e5112c88 100644 --- a/DEPS +++ b/DEPS @@ -1,6 +1,6 @@ deps = { "trunk/third_party/gyp": - "http://gyp.googlecode.com/svn/trunk@1080", + "http://gyp.googlecode.com/svn/trunk@1564", "trunk/third_party/googletest": "http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0 diff --git a/build/common.gypi b/build/common.gypi index 541e914e4..ec53bdc9c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -69,7 +69,7 @@ ], 'RuntimeTypeInfo': 'false', 'WarningLevel': '4', - 'DisableSpecificWarnings': '4100;4127;4189;4239;4244;4245;4512;4702', + 'DisableSpecificWarnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702], }, 'VCLinkerTool': { 'FixedBaseAddress': '1',