diff options
Diffstat (limited to 'projects')
21 files changed, 87 insertions, 47 deletions
diff --git a/projects/Windows/VC10/lib/libcurl.vcxproj b/projects/Windows/VC10/lib/libcurl.vcxproj index a534b133..7a60664c 100644 --- a/projects/Windows/VC10/lib/libcurl.vcxproj +++ b/projects/Windows/VC10/lib/libcurl.vcxproj @@ -2417,8 +2417,6 @@ <ClCompile Include="..\..\..\..\lib\socks_sspi.c" />
<ClCompile Include="..\..\..\..\lib\speedcheck.c" />
<ClCompile Include="..\..\..\..\lib\splay.c" />
- <ClCompile Include="..\..\..\..\lib\ssh.c" />
- <ClCompile Include="..\..\..\..\lib\ssh-libssh.c" />
<ClCompile Include="..\..\..\..\lib\strcase.c" />
<ClCompile Include="..\..\..\..\lib\strdup.c" />
<ClCompile Include="..\..\..\..\lib\strerror.c" />
@@ -2540,6 +2538,7 @@ <ClInclude Include="..\..\..\..\lib\pop3.h" />
<ClInclude Include="..\..\..\..\lib\progress.h" />
<ClInclude Include="..\..\..\..\lib\psl.h" />
+ <ClInclude Include="..\..\..\..\lib\quic.h" />
<ClInclude Include="..\..\..\..\lib\rand.h" />
<ClInclude Include="..\..\..\..\lib\rtsp.h" />
<ClInclude Include="..\..\..\..\lib\select.h" />
diff --git a/projects/Windows/VC10/src/curl.vcxproj b/projects/Windows/VC10/src/curl.vcxproj index 850dd6f9..a4dfabca 100644 --- a/projects/Windows/VC10/src/curl.vcxproj +++ b/projects/Windows/VC10/src/curl.vcxproj @@ -2662,6 +2662,7 @@ <ClCompile Include="..\..\..\..\src\tool_panykey.c" />
<ClCompile Include="..\..\..\..\src\tool_paramhlp.c" />
<ClCompile Include="..\..\..\..\src\tool_parsecfg.c" />
+ <ClCompile Include="..\..\..\..\src\tool_progress.c" />
<ClCompile Include="..\..\..\..\src\tool_setopt.c" />
<ClCompile Include="..\..\..\..\src\tool_sleep.c" />
<ClCompile Include="..\..\..\..\src\tool_strdup.c" />
@@ -2709,6 +2710,7 @@ <ClInclude Include="..\..\..\..\src\tool_panykey.h" />
<ClInclude Include="..\..\..\..\src\tool_paramhlp.h" />
<ClInclude Include="..\..\..\..\src\tool_parsecfg.h" />
+ <ClInclude Include="..\..\..\..\src\tool_progress.h" />
<ClInclude Include="..\..\..\..\src\tool_sdecls.h" />
<ClInclude Include="..\..\..\..\src\tool_setopt.h" />
<ClInclude Include="..\..\..\..\src\tool_setup.h" />
diff --git a/projects/Windows/VC11/lib/libcurl.vcxproj b/projects/Windows/VC11/lib/libcurl.vcxproj index cd7979f6..0aea58de 100644 --- a/projects/Windows/VC11/lib/libcurl.vcxproj +++ b/projects/Windows/VC11/lib/libcurl.vcxproj @@ -2473,8 +2473,6 @@ <ClCompile Include="..\..\..\..\lib\socks_sspi.c" />
<ClCompile Include="..\..\..\..\lib\speedcheck.c" />
<ClCompile Include="..\..\..\..\lib\splay.c" />
- <ClCompile Include="..\..\..\..\lib\ssh.c" />
- <ClCompile Include="..\..\..\..\lib\ssh-libssh.c" />
<ClCompile Include="..\..\..\..\lib\strcase.c" />
<ClCompile Include="..\..\..\..\lib\strdup.c" />
<ClCompile Include="..\..\..\..\lib\strerror.c" />
@@ -2596,6 +2594,7 @@ <ClInclude Include="..\..\..\..\lib\pop3.h" />
<ClInclude Include="..\..\..\..\lib\progress.h" />
<ClInclude Include="..\..\..\..\lib\psl.h" />
+ <ClInclude Include="..\..\..\..\lib\quic.h" />
<ClInclude Include="..\..\..\..\lib\rand.h" />
<ClInclude Include="..\..\..\..\lib\rtsp.h" />
<ClInclude Include="..\..\..\..\lib\select.h" />
diff --git a/projects/Windows/VC11/src/curl.vcxproj b/projects/Windows/VC11/src/curl.vcxproj index 3e6beb10..0c9adcbc 100644 --- a/projects/Windows/VC11/src/curl.vcxproj +++ b/projects/Windows/VC11/src/curl.vcxproj @@ -2718,6 +2718,7 @@ <ClCompile Include="..\..\..\..\src\tool_panykey.c" />
<ClCompile Include="..\..\..\..\src\tool_paramhlp.c" />
<ClCompile Include="..\..\..\..\src\tool_parsecfg.c" />
+ <ClCompile Include="..\..\..\..\src\tool_progress.c" />
<ClCompile Include="..\..\..\..\src\tool_setopt.c" />
<ClCompile Include="..\..\..\..\src\tool_sleep.c" />
<ClCompile Include="..\..\..\..\src\tool_strdup.c" />
@@ -2765,6 +2766,7 @@ <ClInclude Include="..\..\..\..\src\tool_panykey.h" />
<ClInclude Include="..\..\..\..\src\tool_paramhlp.h" />
<ClInclude Include="..\..\..\..\src\tool_parsecfg.h" />
+ <ClInclude Include="..\..\..\..\src\tool_progress.h" />
<ClInclude Include="..\..\..\..\src\tool_sdecls.h" />
<ClInclude Include="..\..\..\..\src\tool_setopt.h" />
<ClInclude Include="..\..\..\..\src\tool_setup.h" />
diff --git a/projects/Windows/VC12/lib/libcurl.vcxproj b/projects/Windows/VC12/lib/libcurl.vcxproj index c77e935d..01a7bae6 100644 --- a/projects/Windows/VC12/lib/libcurl.vcxproj +++ b/projects/Windows/VC12/lib/libcurl.vcxproj @@ -2473,8 +2473,6 @@ <ClCompile Include="..\..\..\..\lib\socks_sspi.c" />
<ClCompile Include="..\..\..\..\lib\speedcheck.c" />
<ClCompile Include="..\..\..\..\lib\splay.c" />
- <ClCompile Include="..\..\..\..\lib\ssh.c" />
- <ClCompile Include="..\..\..\..\lib\ssh-libssh.c" />
<ClCompile Include="..\..\..\..\lib\strcase.c" />
<ClCompile Include="..\..\..\..\lib\strdup.c" />
<ClCompile Include="..\..\..\..\lib\strerror.c" />
@@ -2596,6 +2594,7 @@ <ClInclude Include="..\..\..\..\lib\pop3.h" />
<ClInclude Include="..\..\..\..\lib\progress.h" />
<ClInclude Include="..\..\..\..\lib\psl.h" />
+ <ClInclude Include="..\..\..\..\lib\quic.h" />
<ClInclude Include="..\..\..\..\lib\rand.h" />
<ClInclude Include="..\..\..\..\lib\rtsp.h" />
<ClInclude Include="..\..\..\..\lib\select.h" />
diff --git a/projects/Windows/VC12/src/curl.vcxproj b/projects/Windows/VC12/src/curl.vcxproj index bb3bb764..c03c56de 100644 --- a/projects/Windows/VC12/src/curl.vcxproj +++ b/projects/Windows/VC12/src/curl.vcxproj @@ -2718,6 +2718,7 @@ <ClCompile Include="..\..\..\..\src\tool_panykey.c" />
<ClCompile Include="..\..\..\..\src\tool_paramhlp.c" />
<ClCompile Include="..\..\..\..\src\tool_parsecfg.c" />
+ <ClCompile Include="..\..\..\..\src\tool_progress.c" />
<ClCompile Include="..\..\..\..\src\tool_setopt.c" />
<ClCompile Include="..\..\..\..\src\tool_sleep.c" />
<ClCompile Include="..\..\..\..\src\tool_strdup.c" />
@@ -2765,6 +2766,7 @@ <ClInclude Include="..\..\..\..\src\tool_panykey.h" />
<ClInclude Include="..\..\..\..\src\tool_paramhlp.h" />
<ClInclude Include="..\..\..\..\src\tool_parsecfg.h" />
+ <ClInclude Include="..\..\..\..\src\tool_progress.h" />
<ClInclude Include="..\..\..\..\src\tool_sdecls.h" />
<ClInclude Include="..\..\..\..\src\tool_setopt.h" />
<ClInclude Include="..\..\..\..\src\tool_setup.h" />
diff --git a/projects/Windows/VC14/lib/libcurl.vcxproj b/projects/Windows/VC14/lib/libcurl.vcxproj index 9ca70939..943046d0 100644 --- a/projects/Windows/VC14/lib/libcurl.vcxproj +++ b/projects/Windows/VC14/lib/libcurl.vcxproj @@ -2473,8 +2473,6 @@ <ClCompile Include="..\..\..\..\lib\socks_sspi.c" />
<ClCompile Include="..\..\..\..\lib\speedcheck.c" />
<ClCompile Include="..\..\..\..\lib\splay.c" />
- <ClCompile Include="..\..\..\..\lib\ssh.c" />
- <ClCompile Include="..\..\..\..\lib\ssh-libssh.c" />
<ClCompile Include="..\..\..\..\lib\strcase.c" />
<ClCompile Include="..\..\..\..\lib\strdup.c" />
<ClCompile Include="..\..\..\..\lib\strerror.c" />
@@ -2596,6 +2594,7 @@ <ClInclude Include="..\..\..\..\lib\pop3.h" />
<ClInclude Include="..\..\..\..\lib\progress.h" />
<ClInclude Include="..\..\..\..\lib\psl.h" />
+ <ClInclude Include="..\..\..\..\lib\quic.h" />
<ClInclude Include="..\..\..\..\lib\rand.h" />
<ClInclude Include="..\..\..\..\lib\rtsp.h" />
<ClInclude Include="..\..\..\..\lib\select.h" />
diff --git a/projects/Windows/VC14/src/curl.vcxproj b/projects/Windows/VC14/src/curl.vcxproj index c2089600..36806609 100644 --- a/projects/Windows/VC14/src/curl.vcxproj +++ b/projects/Windows/VC14/src/curl.vcxproj @@ -2718,6 +2718,7 @@ <ClCompile Include="..\..\..\..\src\tool_panykey.c" />
<ClCompile Include="..\..\..\..\src\tool_paramhlp.c" />
<ClCompile Include="..\..\..\..\src\tool_parsecfg.c" />
+ <ClCompile Include="..\..\..\..\src\tool_progress.c" />
<ClCompile Include="..\..\..\..\src\tool_setopt.c" />
<ClCompile Include="..\..\..\..\src\tool_sleep.c" />
<ClCompile Include="..\..\..\..\src\tool_strdup.c" />
@@ -2765,6 +2766,7 @@ <ClInclude Include="..\..\..\..\src\tool_panykey.h" />
<ClInclude Include="..\..\..\..\src\tool_paramhlp.h" />
<ClInclude Include="..\..\..\..\src\tool_parsecfg.h" />
+ <ClInclude Include="..\..\..\..\src\tool_progress.h" />
<ClInclude Include="..\..\..\..\src\tool_sdecls.h" />
<ClInclude Include="..\..\..\..\src\tool_setopt.h" />
<ClInclude Include="..\..\..\..\src\tool_setup.h" />
diff --git a/projects/Windows/VC15/lib/libcurl.vcxproj b/projects/Windows/VC15/lib/libcurl.vcxproj index 3a6978d0..1f14dbab 100644 --- a/projects/Windows/VC15/lib/libcurl.vcxproj +++ b/projects/Windows/VC15/lib/libcurl.vcxproj @@ -2445,8 +2445,6 @@ <ClCompile Include="..\..\..\..\lib\socks_sspi.c" />
<ClCompile Include="..\..\..\..\lib\speedcheck.c" />
<ClCompile Include="..\..\..\..\lib\splay.c" />
- <ClCompile Include="..\..\..\..\lib\ssh.c" />
- <ClCompile Include="..\..\..\..\lib\ssh-libssh.c" />
<ClCompile Include="..\..\..\..\lib\strcase.c" />
<ClCompile Include="..\..\..\..\lib\strdup.c" />
<ClCompile Include="..\..\..\..\lib\strerror.c" />
@@ -2568,6 +2566,7 @@ <ClInclude Include="..\..\..\..\lib\pop3.h" />
<ClInclude Include="..\..\..\..\lib\progress.h" />
<ClInclude Include="..\..\..\..\lib\psl.h" />
+ <ClInclude Include="..\..\..\..\lib\quic.h" />
<ClInclude Include="..\..\..\..\lib\rand.h" />
<ClInclude Include="..\..\..\..\lib\rtsp.h" />
<ClInclude Include="..\..\..\..\lib\select.h" />
diff --git a/projects/Windows/VC15/src/curl.vcxproj b/projects/Windows/VC15/src/curl.vcxproj index 7c12fab8..f1d44833 100644 --- a/projects/Windows/VC15/src/curl.vcxproj +++ b/projects/Windows/VC15/src/curl.vcxproj @@ -2690,6 +2690,7 @@ <ClCompile Include="..\..\..\..\src\tool_panykey.c" />
<ClCompile Include="..\..\..\..\src\tool_paramhlp.c" />
<ClCompile Include="..\..\..\..\src\tool_parsecfg.c" />
+ <ClCompile Include="..\..\..\..\src\tool_progress.c" />
<ClCompile Include="..\..\..\..\src\tool_setopt.c" />
<ClCompile Include="..\..\..\..\src\tool_sleep.c" />
<ClCompile Include="..\..\..\..\src\tool_strdup.c" />
@@ -2737,6 +2738,7 @@ <ClInclude Include="..\..\..\..\src\tool_panykey.h" />
<ClInclude Include="..\..\..\..\src\tool_paramhlp.h" />
<ClInclude Include="..\..\..\..\src\tool_parsecfg.h" />
+ <ClInclude Include="..\..\..\..\src\tool_progress.h" />
<ClInclude Include="..\..\..\..\src\tool_sdecls.h" />
<ClInclude Include="..\..\..\..\src\tool_setopt.h" />
<ClInclude Include="..\..\..\..\src\tool_setup.h" />
diff --git a/projects/Windows/VC6/lib/libcurl.dsp b/projects/Windows/VC6/lib/libcurl.dsp index 16c65184..19bea26e 100644 --- a/projects/Windows/VC6/lib/libcurl.dsp +++ b/projects/Windows/VC6/lib/libcurl.dsp @@ -1106,14 +1106,6 @@ SOURCE=..\..\..\..\lib\splay.c # End Source File
# Begin Source File
-SOURCE=..\..\..\..\lib\ssh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\ssh-libssh.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\lib\strcase.c
# End Source File
# Begin Source File
@@ -1594,6 +1586,10 @@ SOURCE=..\..\..\..\lib\psl.h # End Source File
# Begin Source File
+SOURCE=..\..\..\..\lib\quic.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\lib\rand.h
# End Source File
# Begin Source File
diff --git a/projects/Windows/VC6/src/curl.dsp b/projects/Windows/VC6/src/curl.dsp index 05dd73c7..ff2617a9 100644 --- a/projects/Windows/VC6/src/curl.dsp +++ b/projects/Windows/VC6/src/curl.dsp @@ -819,6 +819,10 @@ SOURCE=..\..\..\..\src\tool_parsecfg.c # End Source File
# Begin Source File
+SOURCE=..\..\..\..\src\tool_progress.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\tool_setopt.c
# End Source File
# Begin Source File
@@ -1003,6 +1007,10 @@ SOURCE=..\..\..\..\src\tool_parsecfg.h # End Source File
# Begin Source File
+SOURCE=..\..\..\..\src\tool_progress.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\tool_sdecls.h
# End Source File
# Begin Source File
diff --git a/projects/Windows/VC7.1/lib/libcurl.vcproj b/projects/Windows/VC7.1/lib/libcurl.vcproj index 0203dbee..3b07dca1 100644 --- a/projects/Windows/VC7.1/lib/libcurl.vcproj +++ b/projects/Windows/VC7.1/lib/libcurl.vcproj @@ -1538,12 +1538,6 @@ RelativePath="..\..\..\..\lib\splay.c">
</File>
<File
- RelativePath="..\..\..\..\lib\ssh.c">
- </File>
- <File
- RelativePath="..\..\..\..\lib\ssh-libssh.c">
- </File>
- <File
RelativePath="..\..\..\..\lib\strcase.c">
</File>
<File
@@ -1830,6 +1824,9 @@ RelativePath="..\..\..\..\lib\psl.h">
</File>
<File
+ RelativePath="..\..\..\..\lib\quic.h">
+ </File>
+ <File
RelativePath="..\..\..\..\lib\rand.h">
</File>
<File
diff --git a/projects/Windows/VC7.1/src/curl.vcproj b/projects/Windows/VC7.1/src/curl.vcproj index 8fecea6b..00f6a7f6 100644 --- a/projects/Windows/VC7.1/src/curl.vcproj +++ b/projects/Windows/VC7.1/src/curl.vcproj @@ -1467,6 +1467,9 @@ RelativePath="..\..\..\..\src\tool_parsecfg.c">
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_setopt.c">
</File>
<File
@@ -1606,6 +1609,9 @@ RelativePath="..\..\..\..\src\tool_parsecfg.h">
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.h">
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_sdecls.h">
</File>
<File
diff --git a/projects/Windows/VC7/lib/libcurl.vcproj b/projects/Windows/VC7/lib/libcurl.vcproj index bab7b564..61e31c22 100644 --- a/projects/Windows/VC7/lib/libcurl.vcproj +++ b/projects/Windows/VC7/lib/libcurl.vcproj @@ -1392,12 +1392,6 @@ RelativePath="..\..\..\..\lib\splay.c">
</File>
<File
- RelativePath="..\..\..\..\lib\ssh.c">
- </File>
- <File
- RelativePath="..\..\..\..\lib\ssh-libssh.c">
- </File>
- <File
RelativePath="..\..\..\..\lib\strcase.c">
</File>
<File
@@ -1684,6 +1678,9 @@ RelativePath="..\..\..\..\lib\psl.h">
</File>
<File
+ RelativePath="..\..\..\..\lib\quic.h">
+ </File>
+ <File
RelativePath="..\..\..\..\lib\rand.h">
</File>
<File
diff --git a/projects/Windows/VC7/src/curl.vcproj b/projects/Windows/VC7/src/curl.vcproj index 821aebc3..fe5a6a8f 100644 --- a/projects/Windows/VC7/src/curl.vcproj +++ b/projects/Windows/VC7/src/curl.vcproj @@ -1321,6 +1321,9 @@ RelativePath="..\..\..\..\src\tool_parsecfg.c">
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_setopt.c">
</File>
<File
@@ -1460,6 +1463,9 @@ RelativePath="..\..\..\..\src\tool_parsecfg.h">
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.h">
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_sdecls.h">
</File>
<File
diff --git a/projects/Windows/VC8/lib/libcurl.vcproj b/projects/Windows/VC8/lib/libcurl.vcproj index a9e670d2..f258fc77 100644 --- a/projects/Windows/VC8/lib/libcurl.vcproj +++ b/projects/Windows/VC8/lib/libcurl.vcproj @@ -3993,14 +3993,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\lib\ssh.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\lib\ssh-libssh.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\lib\strcase.c"
>
</File>
@@ -4381,6 +4373,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\lib\quic.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\lib\rand.h"
>
</File>
diff --git a/projects/Windows/VC8/src/curl.vcproj b/projects/Windows/VC8/src/curl.vcproj index fb031cf1..7b554c78 100644 --- a/projects/Windows/VC8/src/curl.vcproj +++ b/projects/Windows/VC8/src/curl.vcproj @@ -4221,6 +4221,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_setopt.c"
>
</File>
@@ -4405,6 +4409,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_sdecls.h"
>
</File>
diff --git a/projects/Windows/VC9/lib/libcurl.vcproj b/projects/Windows/VC9/lib/libcurl.vcproj index f3999d8e..a02a0d97 100644 --- a/projects/Windows/VC9/lib/libcurl.vcproj +++ b/projects/Windows/VC9/lib/libcurl.vcproj @@ -3934,14 +3934,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\lib\ssh.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\lib\ssh-libssh.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\lib\strcase.c"
>
</File>
@@ -4322,6 +4314,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\lib\quic.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\lib\rand.h"
>
</File>
diff --git a/projects/Windows/VC9/src/curl.vcproj b/projects/Windows/VC9/src/curl.vcproj index 1d0ae65e..6e702f49 100644 --- a/projects/Windows/VC9/src/curl.vcproj +++ b/projects/Windows/VC9/src/curl.vcproj @@ -4078,6 +4078,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_setopt.c"
>
</File>
@@ -4262,6 +4266,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\tool_progress.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\tool_sdecls.h"
>
</File>
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 793a63be..c9633b44 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -95,6 +95,19 @@ 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 + + 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" ( @@ -202,6 +215,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 ) if exist "%START_DIR%\ms\do_ms.bat" ( @@ -222,6 +236,8 @@ rem *************************************************************************** call "%ABS_VC_PATH%\bin\vcvars32" ) else if "%VC_VER%" == "14.1" ( call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% + ) else if "%VC_VER%" == "14.2" ( + call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% ) else ( call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM% ) @@ -569,7 +585,7 @@ rem if not exist "%OUTDIR%\DLL Release" ( mkdir "%OUTDIR%\DLL Release" 1>nul ) - + move !build_dir!\lib\*.lib "%OUTDIR%\DLL Release" 1>nul move !build_dir!\bin\*.dll "%OUTDIR%\DLL Release" 1>nul move !build_dir!\bin\*.exe "%OUTDIR%\DLL Release" 1>nul @@ -605,6 +621,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. |