diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 20:32:51 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 20:32:51 +0000 |
| commit | 7876418b8c8022b1e810e95694cdaa76802b554a (patch) | |
| tree | 7dcf00c06252f1fdc073c413f8fb1925340852ae | |
| parent | 345379a58a63d35db9bb0dfd4776141a0542c337 (diff) | |
| download | chromium_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
| -rw-r--r-- | build/common.gypi | 21 | ||||
| -rw-r--r-- | testing/gtest.gyp | 2 |
2 files changed, 2 insertions, 21 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0e47cfe..5cc44cd 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1279,7 +1279,7 @@ },{ 'msvs_large_module_debug_link_mode%': '2', # Yes }], - ['MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="2005e"', { + ['MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e"', { 'msvs_express%': 1, 'secure_atl%': 0, },{ @@ -3705,11 +3705,6 @@ '_HAS_EXCEPTIONS=0', ], }], - ['MSVS_VERSION=="2008"', { - 'defines': [ - '_HAS_TR1=0', - ], - }], ['secure_atl', { 'defines': [ '_SECURE_ATL', @@ -3813,20 +3808,6 @@ 'winmm.lib', 'shlwapi.lib', ], - - 'conditions': [ - ['MSVS_VERSION=="2005e"', { - # Non-express versions link automatically to these - 'AdditionalDependencies': [ - 'advapi32.lib', - 'comdlg32.lib', - 'ole32.lib', - 'shell32.lib', - 'user32.lib', - 'winspool.lib', - ], - }], - ], 'AdditionalLibraryDirectories': [ '<(windows_sdk_path)/Lib/win8/um/x86', ], 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', ], |