Skip to content

A
angle
Commit 14fcb33a by shannon.woods@transgaming.com
Options

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
parent 00032cb2
Showing with 2 additions and 2 deletions
DEPS
deps = { deps = {
"trunk/third_party/gyp": "trunk/third_party/gyp":
"http://gyp.googlecode.com/svn/trunk@1080", "http://gyp.googlecode.com/svn/trunk@1564",
"trunk/third_party/googletest": "trunk/third_party/googletest":
"http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0 "http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0
......
build/common.gypi
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
], ],
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'false',
'WarningLevel': '4', 'WarningLevel': '4',
'DisableSpecificWarnings': '4100;4127;4189;4239;4244;4245;4512;4702', 'DisableSpecificWarnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'FixedBaseAddress': '1', 'FixedBaseAddress': '1',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment