Browse Source

fixings for Windoze

merge-experiment
Volker Birk 7 years ago
parent
commit
60a2e73849
4 changed files with 9 additions and 2 deletions
  1. +1
    -0
      build-windows/build_headers.list
  2. +4
    -1
      build-windows/libetpan/libetpan.vcxproj
  3. +3
    -0
      build-windows/libetpan/libetpan.vcxproj.filters
  4. +1
    -1
      src/data-types/mailstream_ssl.c

+ 1
- 0
build-windows/build_headers.list View File

@ -129,6 +129,7 @@ src\low-level\mh\mailmh.h
src\low-level\mime\mailmime.h
src\low-level\mime\mailmime_content.h
src\low-level\mime\mailmime_decode.h
src\low-level\mime\mailmime_encode.h
src\low-level\mime\mailmime_disposition.h
src\low-level\mime\mailmime_types.h
src\low-level\mime\mailmime_types_helper.h


+ 4
- 1
build-windows/libetpan/libetpan.vcxproj View File

@ -69,6 +69,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>C:\Program Files %28x86%29\zlib128-dll\include;C:\Program Files %28x86%29\OpenSSL\include;C:\CMU\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files %28x86%29\zlib128-dll\lib;C:\Program Files %28x86%29\OpenSSL\lib;C:\CMU\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
@ -98,7 +100,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/DLL %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libsasl2.dll;zlib.lib;Ws2_32.lib;ssleay32MDd.lib;libeay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libsasl.lib;zdll.lib;Ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>../../third-party/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>C;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -372,6 +374,7 @@ build_headers.bat
<ClCompile Include="..\..\src\low-level\mime\mailmime_content.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_decode.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_disposition.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_encode.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_types.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_types_helper.c" />
<ClCompile Include="..\..\src\low-level\mime\mailmime_write_file.c" />


+ 3
- 0
build-windows/libetpan/libetpan.vcxproj.filters View File

@ -618,6 +618,9 @@
<ClCompile Include="..\..\src\low-level\smtp\mailsmtp_oauth2.c">
<Filter>Source Files\low-level\smtp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\low-level\mime\mailmime_encode.c">
<Filter>Source Files\low-level\mime</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\windows\win_etpan.h">


+ 1
- 1
src/data-types/mailstream_ssl.c View File

@ -388,7 +388,7 @@ static void mailstream_ssl_context_free(struct mailstream_ssl_context * ssl_ctx)
static int mailstream_openssl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
{
struct mailstream_ssl_context * ssl_context = (struct mailstream_ssl_context *)SSL_CTX_get_app_data(ssl->ctx);
struct mailstream_ssl_context * ssl_context = (struct mailstream_ssl_context *)SSL_get_app_data(ssl);
if (x509 == NULL || pkey == NULL) {
return 0;


Loading…
Cancel
Save