[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 222/411: build-wolfssl: fix build with Visual Studio 2019
From: |
gnunet |
Subject: |
[gnurl] 222/411: build-wolfssl: fix build with Visual Studio 2019 |
Date: |
Wed, 13 Jan 2021 01:20:37 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit af782db0e3b6025c7e3d2fa75421e0854b0bfb22
Author: M.R.T <40250976+MRT-77@users.noreply.github.com>
AuthorDate: Fri Oct 2 05:48:36 2020 +0330
build-wolfssl: fix build with Visual Studio 2019
Closes https://github.com/curl/curl/pull/6033
---
projects/build-wolfssl.bat | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/projects/build-wolfssl.bat b/projects/build-wolfssl.bat
index 9a7d67b79..ea077d1db 100644
--- a/projects/build-wolfssl.bat
+++ b/projects/build-wolfssl.bat
@@ -82,6 +82,20 @@ rem
***************************************************************************
) else (
set "VC_PATH=Microsoft Visual Studio\2017\Community\VC"
)
+ ) else if /i "%~1" == "vc14.2" (
+ set VC_VER=14.2
+ set VC_DESC=VC14.2
+ set VC_TOOLSET=v142
+
+ rem Determine the VC14.2 path based on the installed edition in descending
+ rem order (Enterprise, then Professional and finally Community)
+ if exist "%PF%\Microsoft Visual Studio\2019\Enterprise\VC" (
+ set "VC_PATH=Microsoft Visual Studio\2019\Enterprise\VC"
+ ) else if exist "%PF%\Microsoft Visual Studio\2019\Professional\VC" (
+ set "VC_PATH=Microsoft Visual Studio\2019\Professional\VC"
+ ) else (
+ set "VC_PATH=Microsoft Visual Studio\2019\Community\VC"
+ )
) else if /i "%~1" == "x86" (
set BUILD_PLATFORM=x86
) else if /i "%~1" == "x64" (
@@ -133,6 +147,7 @@ rem
***************************************************************************
if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
+ if "%VC_VER%" == "14.2" set VCVARS_PLATFORM=amd64
)
:start
@@ -141,6 +156,8 @@ rem
***************************************************************************
if "%VC_VER%" == "14.1" (
call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
+ ) else if "%VC_VER%" == "14.2" (
+ call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else (
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
)
@@ -308,6 +325,7 @@ rem
***************************************************************************
echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015
echo vc14.1 - Use Visual Studio 2017
+ echo vc14.2 - Use Visual Studio 2019
echo.
echo Platform:
echo.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 337/411: cmake: correctly handle linker flags for static libs, (continued)
- [gnurl] 337/411: cmake: correctly handle linker flags for static libs, gnunet, 2021/01/12
- [gnurl] 291/411: tool_operate: --retry for HTTP 408 responses too, gnunet, 2021/01/12
- [gnurl] 361/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 315/411: hsts: Remove pointless call to free in errorpath, gnunet, 2021/01/12
- [gnurl] 367/411: Makefile.m32: add support for UNICODE builds, gnunet, 2021/01/12
- [gnurl] 285/411: configure: use pkgconfig to find openSSL when cross-compiling, gnunet, 2021/01/12
- [gnurl] 354/411: cmake: make CURL_ZLIB a tri-state variable, gnunet, 2021/01/12
- [gnurl] 357/411: mailmap: Daniel Hwang, gnunet, 2021/01/12
- [gnurl] 265/411: CMake: store IDN2 information in curl_config.h, gnunet, 2021/01/12
- [gnurl] 351/411: KNOWN_BUGS: cmake autodetects cert paths when cross-compiling, gnunet, 2021/01/12
- [gnurl] 222/411: build-wolfssl: fix build with Visual Studio 2019,
gnunet <=
- [gnurl] 202/411: src: Consistently spell whitespace without whitespace, gnunet, 2021/01/12
- [gnurl] 224/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 277/411: range.d: fix typo, gnunet, 2021/01/12
- [gnurl] 296/411: sendf: move the verbose-check into Curl_debug, gnunet, 2021/01/12
- [gnurl] 359/411: tests/server/tftpd.c: close upload file right after transfer, gnunet, 2021/01/12
- [gnurl] 321/411: test493: verify --hsts upgrade and that %{url_effective} reflects that, gnunet, 2021/01/12
- [gnurl] 314/411: docs: Fix various typos in documentation, gnunet, 2021/01/12
- [gnurl] 364/411: http3: use the master branch of GnuTLS for testing, gnunet, 2021/01/12
- [gnurl] 349/411: KNOWN_BUGS: cmake libcurl.pc uses absolute library paths, gnunet, 2021/01/12
- [gnurl] 278/411: CURLOPT_DNS_USE_GLOBAL_CACHE.3: fix typo, gnunet, 2021/01/12