cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support the enterprise version of Visual Studio

Browse Source
This commit is contained in:
Frank Denis 2019-05-28 20:27:36 +02:00
parent 39083793f5
commit 77572665ad
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
builds/msvc/build/buildbase.bat
View File

@ -1,19 +1,44 @@
@ECHO OFF @ECHO OFF
REM Usage: [buildbase.bat ..\vs2019\mysolution.sln 16] REM Usage: [buildbase.bat ..\vs2019\mysolution.sln 16]
SETLOCAL enabledelayedexpansion
SET solution=%1 SET solution=%1
SET version=%2 SET version=%2
SET log=build_%version%.log SET log=build_%version%.log
SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
IF %version% == 16 SET tools=Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
IF %version% == 15 SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat IF %version% == 16 (
SET environment="%programfiles(x86)%\%tools%" SET tools=Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
IF NOT EXIST %environment% SET environment="%programfiles%\%tools%" SET environment="%programfiles%\!tools!"
IF NOT EXIST %environment% GOTO no_tools IF NOT EXIST !environment! (
SET environment="%programfiles(x86)%\!tools!"
IF NOT EXIST !environment! (
SET tools=Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
)
)
)
IF %version% == 15 (
SET tools=Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
SET environment="%programfiles%\!tools!"
IF NOT EXIST !environment! (
SET environment="%programfiles(x86)%\!tools!"
IF NOT EXIST !environment! (
SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
)
)
)
SET environment="%programfiles%\!tools!"
IF NOT EXIST !environment! SET environment="%programfiles(x86)%\!tools!"
ECHO Environment: !environment!
IF NOT EXIST !environment! GOTO no_tools
ECHO Building: %solution% ECHO Building: %solution%
CALL %environment% x86 > nul CALL !environment! x86 > nul
ECHO Platform=x86 ECHO Platform=x86
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
@ -35,7 +60,7 @@ ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log% msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error IF errorlevel 1 GOTO error
CALL %environment% x86_amd64 > nul CALL !environment! x86_amd64 > nul
ECHO Platform=x64 ECHO Platform=x64
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
@ -65,7 +90,7 @@ ECHO *** ERROR, build terminated early, see: %log%
GOTO end GOTO end
:no_tools :no_tools
ECHO *** ERROR, build tools not found: %tools% ECHO *** ERROR, build tools not found: !tools!
:end :end