From 681898ed1ea76b5dc6b6894af2d3ccf2fa0e96fc Mon Sep 17 00:00:00 2001
From: Dmitry Babokin <babokin@gmail.com>
Date: Wed, 19 Feb 2014 14:39:14 +0400
Subject: [PATCH] Add VS2012 as a default toolchain on Windows

---
 alloy.py     | 2 +-
 ispc.vcxproj | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/alloy.py b/alloy.py
index 8f49b383..9a492e18 100755
--- a/alloy.py
+++ b/alloy.py
@@ -208,7 +208,7 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
                     from_validation)
         else:
             try_do_LLVM("configure release version ",
-                    'cmake -G "Visual Studio 10" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN +
+                    'cmake -G "Visual Studio 11" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN +
                     '" -DLLVM_LIT_TOOLS_DIR="C:\\gnuwin32\\bin" ..\\' + LLVM_SRC,
                     from_validation)
     else:
diff --git a/ispc.vcxproj b/ispc.vcxproj
index 8aee2988..8fa9be70 100755
--- a/ispc.vcxproj
+++ b/ispc.vcxproj
@@ -365,12 +365,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -429,4 +431,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file