<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DLL Debug|Win32">
<Configuration>DLL Debug</Configuration>
<ClCompile Include="..\..\source\actmgr\frmActivityMgr-tasks.cpp" />
<ClCompile Include="..\..\source\actmgr\frmActivityMgr.cpp" />
<ClCompile Include="..\..\source\AppXestiaAddrBk.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-connect.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-contactlist.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-defaultadrurl.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-processdata.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-servercontact.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-serveretag.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav-sslverify.cpp" />
- <ClCompile Include="..\..\source\carddav\carddav.cpp" />
+ <ClCompile Include="..\..\source\carddav2\carddav2.cpp" />
<ClCompile Include="..\..\source\common\base64.cpp" />
<ClCompile Include="..\..\source\common\defaults.cpp" />
<ClCompile Include="..\..\source\common\dirs.cpp" />
<ClCompile Include="..\..\source\common\events.cpp" />
<ClCompile Include="..\..\source\common\filename.cpp" />
<ClCompile Include="..\..\source\common\getcontactinfo.cpp" />
+ <ClCompile Include="..\..\source\common\languages.cpp" />
<ClCompile Include="..\..\source\common\mime.cpp" />
<ClCompile Include="..\..\source\common\preferences.cpp" />
<ClCompile Include="..\..\source\common\svrblist.cpp" />
<ClCompile Include="..\..\source\common\timers.cpp" />
<ClCompile Include="..\..\source\common\uuid.cpp" />
<ClCompile Include="..\..\source\common\win32ssl.cpp" />
+ <ClCompile Include="..\..\source\connobject\ConnectionObject.cpp" />
+ <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject-Save.cpp" />
<ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject.cpp" />
<ClCompile Include="..\..\source\contacteditor\frmContactEditor-Business.cpp" />
<ClCompile Include="..\..\source\contacteditor\frmContactEditor-Calendar.cpp" />
<ClCompile Include="..\..\source\frmEditAccount.cpp" />
<ClCompile Include="..\..\source\frmInvalidSSLCertificate.cpp" />
<ClCompile Include="..\..\source\frmMain.cpp" />
+ <ClCompile Include="..\..\source\frmNewAccount-CardDAV2.cpp" />
<ClCompile Include="..\..\source\frmNewAccount.cpp" />
<ClCompile Include="..\..\source\frmPreferences.cpp" />
<ClCompile Include="..\..\source\frmSSLCertificate.cpp" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>false</CLRSupport>
<ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(SFML_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(SFML_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<AdditionalDependencies>wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxbase30ud.lib;wxmsw30ud_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;security.lib;cryptui.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>vc_mswuddll_x64\xestiaab_debug.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SFML_64BIT)\lib;$(LIBXML2_64BIT)\lib;$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SFML_64BIT)\lib;$(LIBXML2_64BIT)\lib;$(CURL_64BIT)\builds\\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl\lib;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>vc_mswuddll_x64\xestiaab_debug.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>