From f4a676bfde2a4a0f519ff8ed6d506689589be753 Mon Sep 17 00:00:00 2001 From: Waldi Ravens Date: Tue, 29 Sep 2015 06:14:49 +0200 Subject: [PATCH] Fix build.bat - use available Visual Studio --- build.bat | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 6c69e583c..d8609d938 100644 --- a/build.bat +++ b/build.bat @@ -10,10 +10,18 @@ IF /I "%~1" == "-help" GOTO SHOWHELP IF /I "%~1" == "--help" GOTO SHOWHELP IF /I "%~1" == "/?" GOTO SHOWHELP -IF NOT DEFINED VS120COMNTOOLS ( - ECHO Visual Studio 2013 wasn't found +IF DEFINED VS140COMNTOOLS ( + SET VSVARS_BAT="%VS140COMNTOOLS%vsvars32.bat" +) ELSE ( +IF DEFINED VS130COMNTOOLS ( + SET VSVARS_BAT="%VS130COMNTOOLS%vsvars32.bat" +) ELSE ( +IF DEFINED VS120COMNTOOLS ( + SET VSVARS_BAT="%VS120COMNTOOLS%vsvars32.bat" +) ELSE ( + ECHO Cannot find Visual Studio GOTO EndWithError -) +))) IF "%~1" == "" ( SET "BUILDTYPE=Build" @@ -39,7 +47,7 @@ IF "%~1" == "" ( :START PUSHD "src" -CALL "%VS120COMNTOOLS%vsvars32.bat" x86 +CALL %VSVARS_BAT% x86 TITLE %BUILDTYPE%ing SubtitleEdit - Release^|Any CPU... "MSBuild.exe" SubtitleEdit.sln /t:%BUILDTYPE% /p:Configuration=Release /p:Platform="Any CPU"^