From 92a872251b9323ec4ff2680069bc2c98714c07ad Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Sun, 2 Oct 2016 16:37:22 +0200 Subject: [PATCH] Change to msvc140 2015 build --- build/win64/build-me.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/win64/build-me.bat b/build/win64/build-me.bat index 9950525..2e9ba9f 100644 --- a/build/win64/build-me.bat +++ b/build/win64/build-me.bat @@ -1,11 +1,14 @@ @setlocal +@REM 20161002 - Change to msvc140 build +@set VCVERS=14 +@set GENERATOR=Visual Studio %VCVERS% Win64 @REM 20160324 - Change to relative, and use choice @set TMPPRJ=tidy @echo Build %TMPPRJ% project, in 64-bits @set TMPLOG=bldlog-1.txt @set BLDDIR=%CD% @set TMPROOT=..\..\.. -@set SET_BAT=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat +@set SET_BAT=%ProgramFiles(x86)%\Microsoft Visual Studio %VCVERS%.0\VC\vcvarsall.bat @if NOT EXIST "%SET_BAT%" goto NOBAT @REM if NOT EXIST %TMPROOT%\nul goto NOROOT @set TMPSRC=..\.. @@ -42,7 +45,7 @@ @REM ########################################## @REM set TMPINST=F:\Projects\software.x64 @set TMPOPTS=-DCMAKE_INSTALL_PREFIX=%TMPINST% -@set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64" +@set TMPOPTS=%TMPOPTS% -G "%GENERATOR%" @REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg" @REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_CONFIG_FILE="C:\MDOS\tidy5.cfg" @set TMPOPTS=%TMPOPTS% -DBUILD_SHARED_LIB:BOOL=OFF