From 9fc4aaad1fc2154fad685096a28df50be95427da Mon Sep 17 00:00:00 2001
From: jsmorley <jsmorley@gmail.com>
Date: Fri, 29 Nov 2013 11:42:12 -0500
Subject: [PATCH] Upgrade to Visual Studio 2013

---
 Build/Build.bat                      | 4 ++--
 Build/Installer/Installer.nsi        | 4 ++--
 Build/VS/Rainmeter.Cpp.Default.props | 2 +-
 Build/VS/Rainmeter.Cpp.props         | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Build/Build.bat b/Build/Build.bat
index 1ca3b1ba..34f4e240 100644
--- a/Build/Build.bat
+++ b/Build/Build.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-set VCVARSALL=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat
+set VCVARSALL=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat
 set MAKENSIS=%PROGRAMFILES%\NSIS\MakeNSIS.exe
 set GIT=%PROGRAMFILES%\Git\bin\git.exe
 
@@ -22,7 +22,7 @@ if not exist "%VCVARSALL%" echo ERROR: vcvarsall.bat not found & goto END
 call "%VCVARSALL%" x86 > nul
 
 set MSBUILD="msbuild.exe" /nologo^
-	/p:PlatformToolset=v110_xp;VisualStudioVersion=11.0^
+	/p:PlatformToolset=v120_xp;VisualStudioVersion=12.0^
 	/p:ExcludeTests=true^
 	/p:Configuration=Release
 
diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi
index 04d3a4d9..8bcb4442 100644
--- a/Build/Installer/Installer.nsi
+++ b/Build/Installer/Installer.nsi
@@ -516,8 +516,8 @@ FunctionEnd
 	File /x *Example*.dll "..\..\${DIR}-Release\Plugins\*.dll"
 
 	SetOutPath "$INSTDIR\Runtime"
-	File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcp110.dll"
-	File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcr110.dll"
+	File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC120.CRT\msvcp120.dll"
+	File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC120.CRT\msvcr120.dll"
 !macroend
 
 !macro RemoveStartMenuShortcuts STARTMENUPATH
diff --git a/Build/VS/Rainmeter.Cpp.Default.props b/Build/VS/Rainmeter.Cpp.Default.props
index a6f1e70e..acfa2e60 100644
--- a/Build/VS/Rainmeter.Cpp.Default.props
+++ b/Build/VS/Rainmeter.Cpp.Default.props
@@ -26,6 +26,6 @@
 
   <PropertyGroup Label="Configuration">
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/VS/Rainmeter.Cpp.props b/Build/VS/Rainmeter.Cpp.props
index e6d34b3f..077b2827 100644
--- a/Build/VS/Rainmeter.Cpp.props
+++ b/Build/VS/Rainmeter.Cpp.props
@@ -2,7 +2,7 @@
 <!-- Visual C++ project options meant to applied after the default Microsoft property sheets. -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <!-- Use the Win8 SDK headers even though we are using the v110_xp toolset. -->
+    <!-- Use the Win8 SDK headers even though we are using the v120_xp toolset. -->
     <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
 
@@ -58,6 +58,7 @@
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
+      <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>