tools: switch default build to latest Visual Studio

This commit is contained in:
Bill Zissimopoulos 2020-05-21 15:51:32 -07:00
parent b663cfdca5
commit 675ecf2e51
6 changed files with 13 additions and 5 deletions

View File

@ -19,7 +19,7 @@ if X%~nx0==Xbuild-choco.bat (
goto :choco
)
call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
call "%~dp0vcvarsall.bat" x64
if not X%SignedPackage%==X (
if not exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp-*.msi" (echo previous build not found >&2 & exit /b 1)

View File

@ -10,7 +10,7 @@ if not X%4==X set ProjDir=%~4
if X!ProjDir!==X (echo usage: build-sample Config Arch Sample ProjDir >&2 & goto fail)
call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
call "%~dp0vcvarsall.bat" x64
if X!FSP_SAMPLE_DIR!==X (
set RegKey="HKLM\SOFTWARE\WinFsp"

View File

@ -19,7 +19,7 @@ if X%~nx0==Xbuild-choco.bat (
goto :choco
)
call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
call "%~dp0vcvarsall.bat" x64
if not X%SignedPackage%==X (
if not exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp-*.msi" (echo previous build not found >&2 & exit /b 1)

View File

@ -19,7 +19,7 @@ set cdef=/D_AMD64_
if /i X%outarch%==Xx86 set arch=x86
if /i X%outarch%==Xx86 set cdef=/D_X86_
call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" !arch!
call "%~dp0vcvarsall.bat" !arch!
set INCLUDE=%~dp0..\opt\fsext\inc;%~dp0..\inc;!WindowsSdkDir!Include\!WindowsSDKVersion!km\crt;!WindowsSdkDir!Include\!WindowsSDKVersion!km;!WindowsSdkDir!Include\!WindowsSDKVersion!km\shared;!INCLUDE!
if exist !workdir! rmdir /s/q !workdir!

View File

@ -5,7 +5,7 @@ setlocal
set Configuration=Release
if not X%1==X set Configuration=%1
call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
call "%~dp0vcvarsall.bat" x64
cd %~dp0..\ext\test
nmake /f Nmakefile

8
tools/vcvarsall.bat Executable file
View File

@ -0,0 +1,8 @@
@echo off
set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
for /f "usebackq tokens=*" %%i in (`%vswhere% -find VC\**\vcvarsall.bat`) do (
set vcvarsall="%%i"
)
call %vcvarsall% %*