From: Haydn Trigg <me@haydntrigg.com>
Date: Wed, 21 Mar 2018 12:27:42 +0000 (+1030)
Subject: Generic Visual Studio 2017 build script
X-Git-Tag: v1.3.4~1^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321de5682c7e3ee435cb74e92d17492412a56ca4;p=thirdparty%2Fzstd.git

Generic Visual Studio 2017 build script
---

diff --git a/build/VS_scripts/build.VS2017.cmd b/build/VS_scripts/build.VS2017.cmd
new file mode 100644
index 000000000..a810faa53
--- /dev/null
+++ b/build/VS_scripts/build.VS2017.cmd
@@ -0,0 +1,7 @@
+@echo off
+
+rem build 32-bit
+call "%~p0%build.generic.cmd" VS2017 Win32 Release v141
+
+rem build 64-bit
+call "%~p0%build.generic.cmd" VS2017 x64 Release v141
\ No newline at end of file
diff --git a/build/VS_scripts/build.generic.cmd b/build/VS_scripts/build.generic.cmd
index aa24053d0..a9bb179f1 100644
--- a/build/VS_scripts/build.generic.cmd
+++ b/build/VS_scripts/build.generic.cmd
@@ -29,11 +29,23 @@ EXIT /B 1
 :build
 
 SET msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
+SET msbuild_vs2017community="%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
+SET msbuild_vs2017professional="%programfiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe"
+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%
+)
 
 SET project="%~p0\..\VS2010\zstd.sln"