From 522d80bd2c2dd04814122529c8b469de4fb459c9 Mon Sep 17 00:00:00 2001
From: Andrey Guskov <andrey.y.guskov@intel.com>
Date: Wed, 11 Mar 2015 15:58:36 +0300
Subject: [PATCH 1/2] Windows build fix

---
 ispc.sln     | 2 +-
 ispc.vcxproj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ispc.sln b/ispc.sln
index a9dbb793..ca596f43 100755
--- a/ispc.sln
+++ b/ispc.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ispc", "ispc.vcxproj", "{9861F490-F516-480C-B63C-D62A77AFA9D5}"
 EndProject
 Global
diff --git a/ispc.vcxproj b/ispc.vcxproj
index c4dc4373..dcb59482 100755
--- a/ispc.vcxproj
+++ b/ispc.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -364,14 +364,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</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>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

From 972c6906d598f22fab73661ee1db5d66f3d5135d Mon Sep 17 00:00:00 2001
From: Andrey Guskov <andrey.y.guskov@intel.com>
Date: Wed, 11 Mar 2015 17:34:12 +0300
Subject: [PATCH 2/2] Fix Alloy.py + MSVC

---
 alloy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alloy.py b/alloy.py
index f8924bdd..8703556a 100755
--- a/alloy.py
+++ b/alloy.py
@@ -254,7 +254,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 11" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN +
+                    'cmake -G "Visual Studio 12" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN +
                     '" -DLLVM_LIT_TOOLS_DIR="C:\\gnuwin32\\bin" ..\\' + LLVM_SRC,
                     from_validation)
     else: