Improved build on win32.

2 files changed, 31 insertions, 7 deletions

diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj
index 1007cf83..9b458840 100644
--- a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj
+++ b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj
@@ -373,69 +373,87 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PTW32_STATIC_LIB;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies>uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;regex.lib;User32.lib;Ws2_32.lib;zlibwapi.lib;libctemplate.lib;kernel32.lib;libetpan.lib;libtidy.dll.lib;libxml2.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\..\Externals\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);..\..\..\include;..\..\..\..\Externals\include;..\..\..\..\src\core\basetypes;..\..\..\..\src\core\zip;..\..\..\..\src\core\zip\minizip;..\..\..\..\src\core\renderer;..\..\..\..\src\core/rfc822;..\..\..\..\src\core/imap;..\..\..\..\src\core\abstract;..\..\..\..\src\core\security;..\..\..\..\src\core\imap;..\..\..\..\src\core\pop;..\..\..\..\src\core\nntp;..\..\..\..\src\core\smtp</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>libtidy.lib;libxml2.lib;uchardet.lib;ssleay32MD.lib;libeay32MD.lib;zlib.lib;User32.lib;Ws2_32.lib;libctemplate.lib;kernel32.lib;libetpan.lib;pthreadVC2.lib;icudt.lib;icuin.lib;icuio.lib;icule.lib;iculx.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.user b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.user
new file mode 100644
index 00000000..89d24524
--- /dev/null
+++ b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>false</ShowAllFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file