From c2313fb73cc0211b2bae9a0e01f7e095b21ddb6e Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 12 Mar 2014 14:41:58 +0000 Subject: [PATCH] Enable VS2013 for Windows compilation by default. BUG=chromium:340973 TEST=All trybots passing runhooks and compile step (needs clobber flag -c to ensure old compile output doesn't cause it to fail). I also ran all the tests for the Windows trybots, which passed. R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/9769004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5687 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/gyp_webrtc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/webrtc/build/gyp_webrtc b/webrtc/build/gyp_webrtc index 9949e95d45..7191c3100c 100755 --- a/webrtc/build/gyp_webrtc +++ b/webrtc/build/gyp_webrtc @@ -60,20 +60,7 @@ if __name__ == '__main__': if not os.environ.get('GYP_GENERATORS'): os.environ['GYP_GENERATORS'] = 'ninja' - # Set default Visual Studio version to 2010 until WebRTC fully supports 2013. - # TODO(kjellander): Remove this to enable 2013 as default when we're ready. - if (sys.platform in ('cygwin', 'win32') and - not os.environ.get('GYP_MSVS_VERSION')): - print 'Setting GYP_MSVS_VERSION to 2010 by default.' - os.environ['GYP_MSVS_VERSION'] = '2010' - - vs2013_runtime_dll_dirs = None - if int(os.environ.get('GYP_MSVS_VERSION', '2010')) == 2013: - # Download Chromium's stripped down Visual Studio 2013 compile toolchain. - # TODO(kjellander): Make this look like gyp_chromium when 2013 works for us, - # this can currently only run for 2013 since GYP_MSVS_VERSION gets - # overwritten with 2013 in DownloadVsToolChain() right now. - vs2013_runtime_dll_dirs = gyp_chromium.DownloadVsToolChain() + vs2013_runtime_dll_dirs = gyp_chromium.DownloadVsToolChain() # Enforce gyp syntax checking. This adds about 20% execution time. args.append('--check')