summaryrefslogtreecommitdiffstats
path: root/testing/gtest.gyp
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 20:32:51 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 20:32:51 +0000
commit7876418b8c8022b1e810e95694cdaa76802b554a (patch)
tree7dcf00c06252f1fdc073c413f8fb1925340852ae /testing/gtest.gyp
parent345379a58a63d35db9bb0dfd4776141a0542c337 (diff)
downloadchromium_src-7876418b8c8022b1e810e95694cdaa76802b554a.zip
chromium_src-7876418b8c8022b1e810e95694cdaa76802b554a.tar.gz
chromium_src-7876418b8c8022b1e810e95694cdaa76802b554a.tar.bz2
Support Visual Studio Express 2012.
Remove Visual Studio 2005 and 2008 support from build/common.gypi. R=mark@chromium.org,scottmg@chromium.org BUG=171142 TEST=none Review URL: https://chromiumcodereview.appspot.com/11933005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
-rw-r--r--testing/gtest.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 7c225e8..7d57d0d 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -140,7 +140,7 @@
],
},
}],
- ['OS=="win" and MSVS_VERSION=="2012"', {
+ ['OS=="win" and (MSVS_VERSION=="2012" or MSVS_VERSION=="2012e")', {
'defines': [
'_VARIADIC_MAX=10',
],