diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-14 15:51:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 15:51:44 +0000 |
| commit | 9aa1a64cabedcc41f8be6608e0ee872b56c454a3 (patch) | |
| tree | 2c3eab943845aec3b36d6ea0e33ce0f5cc412033 /projects/Windows/VC14/lib/libcurl.vcxproj | |
| parent | 0c66739b05f29c81b6a0a6814929e1e6a51c6995 (diff) | |
| parent | d82935bad8787715114b546d997bc3e494fb63cc (diff) | |
| download | external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.gz external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.bz2 external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.zip | |
Merge "Upgrade curl to curl-7_71_1" am: 23abcba889 am: d82935bad8
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1360986
Change-Id: If39a57f7925d048081295b1d981399e38ac55e22
Diffstat (limited to 'projects/Windows/VC14/lib/libcurl.vcxproj')
| -rw-r--r-- | projects/Windows/VC14/lib/libcurl.vcxproj | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/projects/Windows/VC14/lib/libcurl.vcxproj b/projects/Windows/VC14/lib/libcurl.vcxproj index 67220167..89df24bf 100644 --- a/projects/Windows/VC14/lib/libcurl.vcxproj +++ b/projects/Windows/VC14/lib/libcurl.vcxproj @@ -1366,7 +1366,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC14\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
@@ -1400,7 +1400,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC14\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1433,7 +1433,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC14\DLL Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
@@ -1465,7 +1465,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC14\DLL Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
@@ -1756,7 +1756,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC14\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC14\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
@@ -1790,7 +1790,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC14\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC14\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1823,7 +1823,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC14\DLL Release;..\..\..\..\..\libssh2\build\Win32\VC14\DLL Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
@@ -1855,7 +1855,7 @@ <Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>crypt32.lib;ws2_32.lib;wldap32.lib;libeay32.lib;ssleay32.lib;libssh2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC14\DLL Release;..\..\..\..\..\libssh2\build\Win64\VC14\DLL Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
@@ -2409,6 +2409,7 @@ <ClCompile Include="..\..\..\..\lib\dict.c" />
<ClCompile Include="..\..\..\..\lib\doh.c" />
<ClCompile Include="..\..\..\..\lib\dotdot.c" />
+ <ClCompile Include="..\..\..\..\lib\dynbuf.c" />
<ClCompile Include="..\..\..\..\lib\easy.c" />
<ClCompile Include="..\..\..\..\lib\escape.c" />
<ClCompile Include="..\..\..\..\lib\file.c" />
@@ -2506,12 +2507,14 @@ <ClCompile Include="..\..\..\..\lib\vauth\vauth.c" />
<ClCompile Include="..\..\..\..\lib\vquic\ngtcp2.c" />
<ClCompile Include="..\..\..\..\lib\vquic\quiche.c" />
+ <ClCompile Include="..\..\..\..\lib\vquic\vquic.c" />
<ClCompile Include="..\..\..\..\lib\vssh\libssh2.c" />
<ClCompile Include="..\..\..\..\lib\vssh\libssh.c" />
<ClCompile Include="..\..\..\..\lib\vssh\wolfssh.c" />
<ClCompile Include="..\..\..\..\lib\vtls\bearssl.c" />
<ClCompile Include="..\..\..\..\lib\vtls\gskit.c" />
<ClCompile Include="..\..\..\..\lib\vtls\gtls.c" />
+ <ClCompile Include="..\..\..\..\lib\vtls\keylog.c" />
<ClCompile Include="..\..\..\..\lib\vtls\mbedtls.c" />
<ClCompile Include="..\..\..\..\lib\vtls\mbedtls_threadlock.c" />
<ClCompile Include="..\..\..\..\lib\vtls\mesalink.c" />
@@ -2566,6 +2569,7 @@ <ClInclude Include="..\..\..\..\lib\dict.h" />
<ClInclude Include="..\..\..\..\lib\doh.h" />
<ClInclude Include="..\..\..\..\lib\dotdot.h" />
+ <ClInclude Include="..\..\..\..\lib\dynbuf.h" />
<ClInclude Include="..\..\..\..\lib\easyif.h" />
<ClInclude Include="..\..\..\..\lib\escape.h" />
<ClInclude Include="..\..\..\..\lib\file.h" />
@@ -2642,10 +2646,12 @@ <ClInclude Include="..\..\..\..\lib\vauth\vauth.h" />
<ClInclude Include="..\..\..\..\lib\vquic\ngtcp2.h" />
<ClInclude Include="..\..\..\..\lib\vquic\quiche.h" />
+ <ClInclude Include="..\..\..\..\lib\vquic\vquic.h" />
<ClInclude Include="..\..\..\..\lib\vssh\ssh.h" />
<ClInclude Include="..\..\..\..\lib\vtls\bearssl.h" />
<ClInclude Include="..\..\..\..\lib\vtls\gskit.h" />
<ClInclude Include="..\..\..\..\lib\vtls\gtls.h" />
+ <ClInclude Include="..\..\..\..\lib\vtls\keylog.h" />
<ClInclude Include="..\..\..\..\lib\vtls\mbedtls.h" />
<ClInclude Include="..\..\..\..\lib\vtls\mbedtls_threadlock.h" />
<ClInclude Include="..\..\..\..\lib\vtls\mesalink.h" />
|