Update Windows build

build-windows
Thomas 4 years ago
parent c641b2ce11
commit d576fa137c

@ -96,7 +96,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);C:\msys64\mingw32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>
</AdditionalUsingDirectories>
</ClCompile>
@ -108,7 +108,7 @@
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Lib>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\lib\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconv.lib</AdditionalDependencies>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
@ -140,7 +140,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);C:\msys64\mingw32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -153,7 +153,7 @@
</Link>
<Lib>
<AdditionalDependencies>libiconv.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\lib\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
</Lib>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
@ -178,10 +178,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="..\src\scripts\gen_sets.sh" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\attachment.hh" />
<ClInclude Include="..\src\base64.hh" />
<ClInclude Include="..\src\base64.hxx" />
<ClInclude Include="..\src\bodygenerator.hh" />
<ClInclude Include="..\src\bodyparser.hh" />
<ClInclude Include="..\src\headerparser.hh" />
<ClInclude Include="..\src\header_generator.hh" />
<ClInclude Include="..\src\message.hh" />
<ClInclude Include="..\src\mime_headers.hh" />
<ClInclude Include="..\src\nfc.hh" />
@ -191,6 +198,7 @@
<ClInclude Include="..\src\parse_timestamp.hh" />
<ClInclude Include="..\src\pEpMIME.hh" />
<ClInclude Include="..\src\pEpMIME_internal.hh" />
<ClInclude Include="..\src\print_message.hh" />
<ClInclude Include="..\src\quoted_printable.hh" />
<ClInclude Include="..\src\quoted_printable.hxx" />
<ClInclude Include="..\src\rules.hh" />
@ -198,9 +206,13 @@
<ClInclude Include="..\src\to_utf8.hh" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\attachment.cc" />
<ClCompile Include="..\src\base64.cc" />
<ClCompile Include="..\src\bodygenerator.cc" />
<ClCompile Include="..\src\bodyparser.cc" />
<ClCompile Include="..\src\fuzz.cc" />
<ClCompile Include="..\src\headerparser.cc" />
<ClCompile Include="..\src\header_generator.cc" />
<ClCompile Include="..\src\message.cc" />
<ClCompile Include="..\src\mime_headers.cc" />
<ClCompile Include="..\src\nfc.cc" />
@ -211,22 +223,19 @@
<ClCompile Include="..\src\pEpEngine_mime.cc" />
<ClCompile Include="..\src\pEpMIME.cc" />
<ClCompile Include="..\src\pEpMIME_internal.cc" />
<ClCompile Include="..\src\print_message.cc" />
<ClCompile Include="..\src\quoted_printable.cc" />
<ClCompile Include="..\src\rules.cc" />
<ClCompile Include="..\src\to_utf8.cc" />
</ItemGroup>
<ItemGroup>
<None Include="..\src\scripts\gen_sets.sh" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\packages\boost.1.69.0.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.69.0.0\build\boost.targets')" />
<Import Project="..\..\packages\boost.1.70.0.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.70.0.0\build\boost.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\boost.1.69.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.69.0.0\build\boost.targets'))" />
<Error Condition="!Exists('..\..\packages\boost.1.70.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.70.0.0\build\boost.targets'))" />
</Target>
</Project>

File diff suppressed because it is too large Load Diff

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.69.0.0" targetFramework="native" />
<package id="boost" version="1.70.0.0" targetFramework="native" />
</packages>

@ -10,6 +10,10 @@
#include <pEp/message.h>
#ifdef _WIN32
#include <pEp/platform_windows.h>
#endif
namespace pEpMIME
{

@ -10,10 +10,6 @@
#include <pEp/timestamp.h>
#ifdef WIN32
#include <pEp/platform_windows.h>
#endif
// shortcuts
namespace qi = boost::spirit::qi;

@ -2,11 +2,6 @@
// see LICENSE.txt
#include "print_message.hh"
#ifdef WIN32
#include <libpEpAdapter/slurp.hh>
#include <pEp/platform_windows.h>
#else
#endif
#include <iostream>
#include <sstream>

@ -7,11 +7,6 @@
#define PEP_MIME_PRINT_MESSAGE_HH
#include "pEpMIME.hh"
#ifdef WIN32
#include <libpEpAdapter/slurp.hh>
#include <pEp/platform_windows.h>
#else
#endif
#include <iostream>
namespace std

@ -6,12 +6,7 @@
#include "mime_headers.hh"
#include "print_message.hh"
#include "base64.hh"
#ifdef WIN32
#include <libpEpAdapter/slurp.hh>
#include <pEp/platform_windows.h>
#else
#include <pEp/slurp.hh>
#endif
#include <iostream>
#include <gtest/gtest.h>

@ -7,10 +7,6 @@
#include <gtest/gtest.h>
#ifdef WIN32
#include <pEp/platform_windows.h>
#endif
namespace std
{
ostream& operator<<(ostream& o, struct tm const& t)

Loading…
Cancel
Save