PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-01 20:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge 7.94 release branch

Browse Source
This commit is contained in:
dmiller
2023-05-20 22:59:41 +00:00
parent 2558c90488
commit 72d67cf401
32 changed files with 832 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libssh2/win32/libssh2.vcxproj
View File

@@ -89,7 +89,7 @@
<OutputFile>.\Release_dll\libssh2.dll</OutputFile>
<ImportLibrary>.\Release_dll\libssh2.lib</ImportLibrary>
<AdditionalDependencies>ws2_32.lib;libcrypto.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OptimizeReferences>true</OptimizeReferences>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
@@ -136,7 +136,7 @@
<OutputFile>.\Debug_dll\libssh2.dll</OutputFile>
<ImportLibrary>.\Debug_dll\libssh2.lib</ImportLibrary>
<AdditionalDependencies>ws2_32.lib;libcrypto.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc12\x86\ZlibDllDebugWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc14\x86\ZlibDllDebugWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -185,7 +185,7 @@
<ClInclude Include="libssh2_config.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\libz\contrib\vstudio\vc12\zlibvc.vcxproj">
<ProjectReference Include="..\..\libz\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>