diff options
-rw-r--r-- | .gitignore | 14 | ||||
-rw-r--r-- | build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj | 42 | ||||
-rw-r--r-- | src/core/basetypes/MCData.cpp | 2 |
3 files changed, 20 insertions, 38 deletions
@@ -27,3 +27,17 @@ DerivedData #CocoaPods Pods Podfile.lock + +#Windows +*.sdf +*.opensdf +*.suo +Externals +build-windows/include +build-windows/_headers_depends +build-windows/mailcore2/Debug +build-windows/mailcore2/Release +build-windows/mailcore2/mailcore2/mailcore2.Windows/Release +build-windows/mailcore2/mailcore2/mailcore2.Windows/x64/Release +build-windows/mailcore2/mailcore2/mailcore2.Windows/Debug +build-windows/mailcore2/mailcore2/mailcore2.Windows/x64/Debug diff --git a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj index 9b458840..a04b7c46 100644 --- a/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj +++ b/build-windows/mailcore2/mailcore2/mailcore2.Windows/mailcore2.Windows.vcxproj @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -13,10 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -289,6 +281,7 @@ <ApplicationType>Windows Store</ApplicationType> <ApplicationTypeRevision>8.1</ApplicationTypeRevision> <ConvergedProjectType>CodeSharingDll</ConvergedProjectType> + <ProjectName>mailcore2</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -296,11 +289,6 @@ <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> @@ -312,12 +300,6 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> @@ -331,12 +313,6 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> @@ -352,14 +328,6 @@ <GenerateManifest>false</GenerateManifest> <IgnoreImportLibrary>false</IgnoreImportLibrary> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - <IgnoreImportLibrary>false</IgnoreImportLibrary> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - <IgnoreImportLibrary>false</IgnoreImportLibrary> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <GenerateManifest>false</GenerateManifest> <IgnoreImportLibrary>false</IgnoreImportLibrary> @@ -380,7 +348,7 @@ <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> + <AdditionalLibraryDirectories>..\..\..\..\Externals\lib;..\..\..\..\Externals\lib\x86</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -395,7 +363,7 @@ <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> + <AdditionalLibraryDirectories>..\..\..\..\Externals\lib;..\..\..\..\Externals\lib\x86</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> @@ -438,7 +406,7 @@ <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> + <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64;..\..\..\..\Externals\lib\x64</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -453,7 +421,7 @@ <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> + <AdditionalLibraryDirectories>..\..\..\..\Externals\lib64;..\..\..\..\Externals\lib\x64</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/src/core/basetypes/MCData.cpp b/src/core/basetypes/MCData.cpp index 0f792d1f..3a042e46 100644 --- a/src/core/basetypes/MCData.cpp +++ b/src/core/basetypes/MCData.cpp @@ -14,8 +14,8 @@ #include <unicode/ucsdet.h> #endif #include <libetpan/libetpan.h> -#include <iconv.h> #if __APPLE__ +#include <iconv.h> #include <CoreFoundation/CoreFoundation.h> #endif |