Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add use of Visual Studio 2019 (vc142) to official build scripts

Browse Source 
Build binaries using MSVS 2019/vc142 toolset too.

Closes https://github.com/wxWidgets/wxWidgets/pull/1384
This commit is contained in:
dos
2019-07-03 11:11:01 -03:00
committed by Vadim Zeitlin
parent 0c64345890
commit d846cfae6f
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/tools/msvs/buildall.bat
View File

@@ -1,3 +1,4 @@
start cmd /k Call officialbuild.bat vc142
start cmd /k Call officialbuild.bat vc141 start cmd /k Call officialbuild.bat vc141
start cmd /k Call officialbuild.bat vc140 start cmd /k Call officialbuild.bat vc140
start cmd /k Call officialbuild.bat vc120 start cmd /k Call officialbuild.bat vc120

24
build/tools/msvs/officialbuild.bat
View File

@@ -22,6 +22,23 @@ rem ========================================================
set compvers="Unknown" set compvers="Unknown"
if "%1" == "vc142" (
@echo Building for vc142 / vs2019
set comp=142
set compvers=vc142
if NOT "%VS160COMNTOOLS%" == "" (
call "%VS160COMNTOOLS%VsDevCmd.bat"
)
if "%VS160COMNTOOLS%" == "" (
call %curr_dir%\findvs 16.0 17.0
if errorlevel 1 (
@echo vswhere.exe must be in your path or a VS2019 developer command prompt must be used.
goto end
)
)
)
if "%1" == "vc141" ( if "%1" == "vc141" (
@echo Building for vc141 / vs2017 @echo Building for vc141 / vs2017
set comp=141 set comp=141
@@ -79,6 +96,10 @@ if %compvers% == "vc90" (
@echo ============================================================ @echo ============================================================
) )
rem Return to the build directory in case we have been moved elsewhere.
cd %VSCMD_START_DIR%
@echo Removing the existing destination so that a complete rebuild occurs. @echo Removing the existing destination so that a complete rebuild occurs.
rmdir %compvers%_mswuddll /s /q rmdir %compvers%_mswuddll /s /q
@@ -96,6 +117,7 @@ del %compvers%x86_Release.txt
del %compvers%x64_Debug.txt del %compvers%x64_Debug.txt
del %compvers%x64_Release.txt del %compvers%x64_Release.txt
if "%compvers%" == "vc142" call "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64 if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64 if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64 if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
@@ -130,6 +152,7 @@ nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD
if ERRORLEVEL 1 goto ERR_BUILD if ERRORLEVEL 1 goto ERR_BUILD
if "%compvers%" == "vc142" call "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x86
if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x86 if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x86
if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86 if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86 if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
@@ -191,6 +214,7 @@ goto End
:VERSIONS :VERSIONS
@echo. @echo.
@echo Compiler Version: One of - @echo Compiler Version: One of -
@echo vc142
@echo vc141 @echo vc141
@echo vc140 @echo vc140
@echo vc120 @echo vc120