Skip to content

Commit 6a2caca

Browse files
committed
Windows config Zlib to not use ASM, support GZ. Fixes nmap#1723
1 parent 7d7f067 commit 6a2caca

File tree

4 files changed

+204
-16
lines changed

4 files changed

+204
-16
lines changed

libssh2/win32/libssh2.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<OutputFile>.\Release_dll\libssh2.dll</OutputFile>
9090
<ImportLibrary>.\Release_dll\libssh2.lib</ImportLibrary>
9191
<AdditionalDependencies>ws2_32.lib;libeay32.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
92-
<AdditionalLibraryDirectories>..\..\libz\contrib\vstudio\vc12\x86\ZlibDllRelease;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
92+
<AdditionalLibraryDirectories>..\..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9393
</Link>
9494
</ItemDefinitionGroup>
9595
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -135,7 +135,7 @@
135135
<OutputFile>.\Debug_dll\libssh2.dll</OutputFile>
136136
<ImportLibrary>.\Debug_dll\libssh2.lib</ImportLibrary>
137137
<AdditionalDependencies>ws2_32.lib;libeay32.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
138-
<AdditionalLibraryDirectories>..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc12\x86\ZlibDllDebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138+
<AdditionalLibraryDirectories>..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc12\x86\ZlibDllDebugWithoutAsm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
139139
</Link>
140140
</ItemDefinitionGroup>
141141
<ItemGroup>

0 commit comments

Comments
 (0)