From 57e6b98eb11af763dc2d24bd066a0375f0dab8d9 Mon Sep 17 00:00:00 2001 From: Haydn Trigg Date: Thu, 22 Mar 2018 09:10:39 +1030 Subject: [PATCH] Refined build script --- build/VS_scripts/build.generic.cmd | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/build/VS_scripts/build.generic.cmd b/build/VS_scripts/build.generic.cmd index a9bb179f1..3f8630ccb 100644 --- a/build/VS_scripts/build.generic.cmd +++ b/build/VS_scripts/build.generic.cmd @@ -19,10 +19,10 @@ GOTO build :display_help echo Syntax: build.generic.cmd msbuild_version msbuild_platform msbuild_configuration msbuild_toolset -echo msbuild_version: VS installed version (VS2012, VS2013, VS2015, ...) +echo msbuild_version: VS installed version (VS2012, VS2013, VS2015, VS2017, ...) echo msbuild_platform: Platform (x64 or Win32) echo msbuild_configuration: VS configuration (Release or Debug) -echo msbuild_toolset: Platform Toolset (v100, v110, v120, v140) +echo msbuild_toolset: Platform Toolset (v100, v110, v120, v140, v141) EXIT /B 1 @@ -34,17 +34,13 @@ SET msbuild_vs2017professional="%programfiles(x86)%\Microsoft Visual Studio\2017 SET msbuild_vs2017enterprise="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2013 SET msbuild="%programfiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2015 SET msbuild="%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Community SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Professional SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Enterprise SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" -if exist %msbuild_vs2017enterprise% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017enterprise% -) -if exist %msbuild_vs2017professional% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017professional% -) -if exist %msbuild_vs2017community% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017community% +IF %msbuild_version% == VS2017Community SET msbuild="%msbuild_vs2017community% +IF %msbuild_version% == VS2017Professional SET msbuild=%msbuild_vs2017professional% +IF %msbuild_version% == VS2017Enterprise SET msbuild=%msbuild_vs2017enterprise% +IF %msbuild_version% == VS2017 ( + IF EXIST %msbuild_vs2017enterprise% SET msbuild=%msbuild_vs2017enterprise% + IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional% + IF EXIST %msbuild_vs2017community% SET msbuild=%msbuild_vs2017community% ) SET project="%~p0\..\VS2010\zstd.sln"