Update to VS2013.

XhmikosR · Nov 25, 2013 · 88468b8 · 88468b8
1 parent c2f45c0
commit 88468b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/PerfmonBar.sln b/PerfmonBar.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+Microsoft Visual Studio Solution File, Format Version 13.00
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerfmonBar", "src\PerfmonBar.vcxproj", "{132096EE-1897-4D28-82C3-54A082CC3CCF}"
 EndProject
 Global

diff --git a/build.bat b/build.bat
@@ -19,7 +19,7 @@ SETLOCAL ENABLEEXTENSIONS
 CD /D %~dp0
 
 rem Check the building environment
-IF NOT DEFINED VS110COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2012 NOT FOUND!"
+IF NOT DEFINED VS120COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2013 NOT FOUND!"
 
 
 rem Check for the help switches
@@ -85,14 +85,13 @@ IF "%ARCH%" == "x86" GOTO x86
 
 
 :x86
-CALL "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 CALL :SUBMSVC %BUILDTYPE% Win32
 IF "%ARCH%" == "x86" GOTO END
 
 
 :x64
-IF DEFINED PROGRAMFILES(x86) (SET build_type=amd64) ELSE (SET build_type=x86_amd64)
-CALL "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" %build_type%
+CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
 CALL :SUBMSVC %BUILDTYPE% x64
 
 IF /I "%BUILDTYPE%" == "Clean" GOTO END
@@ -108,7 +107,9 @@ EXIT /B
 :SUBMSVC
 ECHO.
 TITLE Building PerfmonBar - %~1 "Release|%~2"...
-devenv /nologo PerfmonBar.sln /%~1 "Release|%~2"
+SET "MSBUILD_SWITCHES=/nologo /consoleloggerparameters:Verbosity=minimal /maxcpucount /nodeReuse:true"
+MSBuild.exe PerfmonBar.sln %MSBUILD_SWITCHES%^
+ /target:%~1 /property:Configuration=Release;Platform=%2
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
 EXIT /B
 

diff --git a/src/PerfmonBar.vcxproj b/src/PerfmonBar.vcxproj
@@ -28,27 +28,27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />