Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Migrate building on Windows to using CMake
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Thu, 13 Aug 2020 07:49:44 +0000 (08:49 +0100)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Thu, 13 Aug 2020 08:09:40 +0000 (09:09 +0100)
18 files changed:
projects/msw/.gitignore [deleted file]
projects/msw/README-W32BUILD.txt [deleted file]
projects/msw/bitmapcode.vcxproj [deleted file]
projects/msw/bitmapcode.vcxproj.filters [deleted file]
projects/msw/odthelpbrowser.vcxproj [deleted file]
projects/msw/odthelpbrowser.vcxproj.filters [deleted file]
projects/msw/xestiaab.sln [deleted file]
projects/msw/xestiaab.vcxproj [deleted file]
projects/msw/xestiaab.vcxproj.filters [deleted file]
source/CMakeFunctions/Application.cmake
source/CMakeFunctions/Packages.cmake
source/CMakeLists.txt
source/common/CMakeLists.txt
source/frmSSLCertificate.cpp
source/os/msw/resource.h [moved from projects/msw/resource.h with 100% similarity]
source/os/msw/xestiaab.rc [moved from projects/msw/xestiaab.rc with 100% similarity]
source/os/msw/xestiaab_win32icon.ico [moved from projects/msw/xestiaab_win32icon.ico with 100% similarity]
source/tools/CMakeLists.txt

diff --git a/projects/msw/.gitignore b/projects/msw/.gitignore
deleted file mode 100644 (file)
index 28e5196..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-.vs/
-x64/
-vc_mswudll/
-vc_mswuddll/
-vc_mswudll_x64/
-vc_mswuddll_x64/
-*.db
-*.opendb
-*.user
diff --git a/projects/msw/README-W32BUILD.txt b/projects/msw/README-W32BUILD.txt
deleted file mode 100644 (file)
index 9bddfbe..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-Xestia Address Book Windows Development
-=======================================
-
-Step 1: Setup environment variables
-===================================
-
-The Visual Studio 2013 (Express) project uses the following environment 
-variables to work out where the header and library files are.
-
-=============================================================================
-| Type         | Arch  | Normal name            | Debug name               |
-=============================================================================
-| wxWidgets    | i686  | WXWIDGETS_32BIT        | WXWIDGETS_32BIT_DEBUG    |
-| wxWidgets    | x64   | WXWIDGETS_64BIT        | WXWIDGETS_64BIT_DEBUG    |
-| SFML         | i686  | SFML_32BIT             | SFML_32BIT               |
-| SFML         | x64   | SFML_64BIT             | SFML_64BIT               |
-| libcurl      | i686  | CURL_32BIT             | CURL_32BIT               |
-| libcurl       | x64   | CURL_64BIT             | CURL_64BIT               |
-| libxml2      | i686  | LIBXML2_32BIT          | LIBXML2_32BIT            |
-| libxml2       | x64   | LIBXML2_64BIT          | LIBXML2_64BIT            |
-| iconv                | i686  | ICONV_32BIT            | ICONV_32BIT              |
-| iconv                | x64   | ICONV_64BIT            | ICONV_64BIT              |
-=============================================================================
-
-To setup the envrionment variables on your system, go into the Control Panel,
-open System and then click on the Advanced System Settings link.
-
-Click on the Advanced tab (if not already showing this tab) and then click on
-the Environment Variables button. Add or edit the variables using the names
-above with the paths to the library directories (don't add include or lib to
-the end of it - this is done by the Visual Studio project itself).
-
-It is recommended to setup these up as user environment variables not system
-enironment variables.
-
-Step 2: Build
-=============
-
-To build, click on Project then Build Solution or press F7. This will then
-build the bitmapcode helper first and then Xestia Address Book.
-
-Release executables tend to be smaller but cannot be debugged as easily 
-compared to the Debug executables.
\ No newline at end of file
diff --git a/projects/msw/bitmapcode.vcxproj b/projects/msw/bitmapcode.vcxproj
deleted file mode 100644 (file)
index aa4b739..0000000
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Debug|x64">
-      <Configuration>DLL Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|Win32">
-      <Configuration>DLL Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|x64">
-      <Configuration>DLL Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\tools\bitmapcode.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>bitmapcode</ProjectName>
-    <ProjectGuid>{966CF7A9-125F-4F94-BBD6-5BD49550ECC2}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <OutDir>vc_mswuddll\</OutDir>
-    <IntDir>vc_mswuddll\bitmapcode</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <OutDir>vc_mswudll\</OutDir>
-    <IntDir>vc_mswudll\bitmapcode</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <OutDir>vc_mswuddll_x64\</OutDir>
-    <IntDir>vc_mswuddll_x64\bitmapcode</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <OutDir>vc_mswudll_x64\</OutDir>
-    <IntDir>vc_mswudll_x64\bitmapcode</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswu;$(WXWIDGETS_32BIT_DEBUG)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ObjectFileName>vc_mswuddll\bitmapcode</ObjectFileName>
-      <ProgramDataBaseFileName>vc_mswuddll\bitmapcode.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>wxmsw30ud_core.lib;wxbase30ud.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;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>vc_mswuddll\bitmapcode.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswuddll\bitmapcode.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswuddll\bitmapcode_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_32BIT)\lib\vc_dll\mswu;$(WXWIDGETS_32BIT)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ProgramDataBaseFileName>vc_mswudll\bitmapcode.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_aui.lib;wxmsw30u_core.lib;wxmsw30u_gl.lib;wxmsw30u_html.lib;wxmsw30u_media.lib;wxmsw30u_propgrid.lib;wxmsw30u_qa.lib;wxmsw30u_ribbon.lib;wxmsw30u_richtext.lib;wxmsw30u_stc.lib;wxmsw30u_webview.lib;wxmsw30u_xrc.lib;wxexpat.lib;wxjpeg.lib;wxpng.lib;wxscintilla.lib;wxtiff.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>vc_mswudll\bitmapcode.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalIncludeDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswudll\bitmapcode.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswudll\xestiaab_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_lib\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_aui.lib;wxmsw30ud_core.lib;wxmsw30ud_gl.lib;wxmsw30ud_html.lib;wxmsw30ud_media.lib;wxmsw30ud_propgrid.lib;wxmsw30ud_qa.lib;wxmsw30ud_ribbon.lib;wxmsw30ud_richtext.lib;wxmsw30ud_stc.lib;wxmsw30ud_webview.lib;wxmsw30ud_xrc.lib;wxexpatd.lib;wxjpegd.lib;wxpngd.lib;wxscintillad.lib;wxtiffd.lib;wxzlibd.lib</AdditionalDependencies>
-      <OutputFile>vc_mswuddll_x64\bitmapcode.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswuddll_x64\bitmapcode_debug_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-    <ProjectReference>
-      <UseLibraryDependencyInputs />
-    </ProjectReference>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_64BIT)\lib\vc_x64_lib\mswud;$(WXWIDGETS_64BIT)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;WXMSW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ObjectFileName>vc_mswudll_x64\bitmapcode\</ObjectFileName>
-      <ProgramDataBaseFileName>vc_mswudll_x64\bitmapcode.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>rpcrt4.lib;wxregexu.lib;comctl32.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_aui.lib;wxmsw30u_core.lib;wxmsw30u_gl.lib;wxmsw30u_html.lib;wxmsw30u_media.lib;wxmsw30u_propgrid.lib;wxmsw30u_qa.lib;wxmsw30u_ribbon.lib;wxmsw30u_richtext.lib;wxmsw30u_stc.lib;wxmsw30u_webview.lib;wxmsw30u_xrc.lib;wxexpat.lib;wxjpeg.lib;wxpng.lib;wxscintilla.lib;wxtiff.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>vc_mswudll_x64\bitmapcode.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(WXWIDGETS_64BIT)\lib\vc_x64_dll;$(WXWIDGETS_64BIT)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswudll_x64\bitmapcode.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswudll_x64\bitmapcode_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/msw/bitmapcode.vcxproj.filters b/projects/msw/bitmapcode.vcxproj.filters
deleted file mode 100644 (file)
index 926c366..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\tools\bitmapcode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/msw/odthelpbrowser.vcxproj b/projects/msw/odthelpbrowser.vcxproj
deleted file mode 100644 (file)
index 36d2c10..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|Win32">
-      <Configuration>DLL Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Debug|x64">
-      <Configuration>DLL Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|x64">
-      <Configuration>DLL Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>odthelpbrowser</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DLL Debug|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)'=='DLL 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)'=='DLL Debug|x64'">
-    <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)'=='DLL Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>vc_mswuddll\</OutDir>
-    <IntDir>vc_mswuddll\odthelpbrowser_debug</IntDir>
-    <TargetName>odthelpbrowser</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>vc_mswuddll_x64\</OutDir>
-    <IntDir>vc_mswuddll_x64\odthelpbrowser_debug</IntDir>
-    <TargetName>odthelpbrowser</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>vc_mswudll_x64\</OutDir>
-    <IntDir>vc_mswudll_x64\odthelpbrowser</IntDir>
-    <TargetName>odthelpbrowser</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>vc_mswudll_x64\</OutDir>
-    <IntDir>vc_mswudll_x64\odthelpbrowser</IntDir>
-    <TargetName>odthelpbrowser</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT_DEBUG)\include;$(ICONV_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2\;.</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>vc_mswudll_x64\odthelpbrowser.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(LIBXML2_32BIT)\lib;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(ICONV_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxbase30ud.lib;wxmsw30ud_adv.lib;libxml2.dll.a;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;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(LIBXML2_64BIT)\lib;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>vc_mswuddll_x64\odthelpbrowser.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2;.</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libxml2.dll.a;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>vc_mswudll\odthelpbrowser.exe</OutputFile>
-      <AdditionalLibraryDirectories>$(LIBXML2_32BIT)\lib;$(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(WXWIDGETS_64BIT)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT)\include;$(ICONV_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(LIBXML2_64BIT)\lib;$(WXWIDGETS_64BIT)\lib\vc_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>vc_mswudll_x64\odthelpbrowser.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\base64.h" />
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\frmMain.h" />
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\odt.h" />
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\ODTHelpBrowser.h" />
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\base64.cpp" />
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\frmMain.cpp" />
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\main.cpp" />
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\odt.cpp" />
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\ODTHelpBrowser.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/msw/odthelpbrowser.vcxproj.filters b/projects/msw/odthelpbrowser.vcxproj.filters
deleted file mode 100644 (file)
index 39cc62a..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\base64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\frmMain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\odt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\ODTHelpBrowser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\tools\odthelpbrowser\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\base64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\frmMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\odt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\odthelpbrowser\ODTHelpBrowser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/msw/xestiaab.sln b/projects/msw/xestiaab.sln
deleted file mode 100644 (file)
index 8cb56fc..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 14 for Windows Desktop
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xestiaab", "xestiaab.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}"
-       ProjectSection(ProjectDependencies) = postProject
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2} = {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitmapcode", "bitmapcode.vcxproj", "{966CF7A9-125F-4F94-BBD6-5BD49550ECC2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odthelpbrowser", "odthelpbrowser.vcxproj", "{34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Debug|x64 = Debug|x64
-               DLL Debug|Win32 = DLL Debug|Win32
-               DLL Debug|x64 = DLL Debug|x64
-               DLL Release|Win32 = DLL Release|Win32
-               DLL Release|x64 = DLL Release|x64
-               Release|Win32 = Release|Win32
-               Release|x64 = Release|x64
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = DLL Debug|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.ActiveCfg = DLL Debug|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.Build.0 = DLL Debug|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Deploy.0 = DLL Debug|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.Build.0 = DLL Debug|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.Build.0 = DLL Release|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.ActiveCfg = DLL Release|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.Build.0 = DLL Release|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = DLL Release|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = DLL Release|Win32
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.ActiveCfg = DLL Release|x64
-               {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.Build.0 = DLL Release|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|Win32.Build.0 = DLL Debug|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|x64.ActiveCfg = DLL Debug|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Debug|x64.Build.0 = DLL Debug|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Debug|x64.Build.0 = DLL Debug|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|Win32.Build.0 = DLL Release|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|x64.ActiveCfg = DLL Release|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.DLL Release|x64.Build.0 = DLL Release|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|Win32.ActiveCfg = DLL Release|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|Win32.Build.0 = DLL Release|Win32
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|x64.ActiveCfg = DLL Release|x64
-               {966CF7A9-125F-4F94-BBD6-5BD49550ECC2}.Release|x64.Build.0 = DLL Release|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|Win32.Build.0 = DLL Debug|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.ActiveCfg = DLL Debug|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Debug|x64.Build.0 = DLL Debug|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Debug|x64.Build.0 = DLL Debug|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|Win32.Build.0 = DLL Release|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.ActiveCfg = DLL Release|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.DLL Release|x64.Build.0 = DLL Release|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.ActiveCfg = DLL Release|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|Win32.Build.0 = DLL Release|Win32
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.ActiveCfg = DLL Release|x64
-               {34CC88D3-DDB7-4A4A-B76E-51483A65D0F4}.Release|x64.Build.0 = DLL Release|x64
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/projects/msw/xestiaab.vcxproj b/projects/msw/xestiaab.vcxproj
deleted file mode 100644 (file)
index c9b923b..0000000
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Debug|x64">
-      <Configuration>DLL Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|Win32">
-      <Configuration>DLL Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DLL Release|x64">
-      <Configuration>DLL Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\actmgr\frmActivityMgr-tasks.cpp" />
-    <ClCompile Include="..\..\source\actmgr\frmActivityMgr.cpp" />
-    <ClCompile Include="..\..\source\AppXestiaAddrBk.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\etag.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\textprocessing.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\contacteditor\frmContactEditor-Category.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Events.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-General.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Groups.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Home.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Init.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Key.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Load.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Logo.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Other.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Picture.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Reset.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Save.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Sound.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorAddress.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorCalAdr.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorCategory.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorEmail.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorGeoposition.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorGroups.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorIM.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorKey.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorLanguages.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorNickname.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorNotes.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorOrganisations.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorPicture.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorRelated.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorRoles.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorSound.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTelephone.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTimezones.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTitles.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorVendor.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorWebsites.cpp" />
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorXToken.cpp" />
-    <ClCompile Include="..\..\source\convert.cpp" />
-    <ClCompile Include="..\..\source\export\export-vcard3.cpp" />
-    <ClCompile Include="..\..\source\export\export-vcard4.cpp" />
-    <ClCompile Include="..\..\source\export\export.cpp" />
-    <ClCompile Include="..\..\source\frmAbout.cpp" />
-    <ClCompile Include="..\..\source\frmConflictResolution.cpp" />
-    <ClCompile Include="..\..\source\frmContact.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" />
-    <ClCompile Include="..\..\source\frmUpdate.cpp" />
-    <ClCompile Include="..\..\source\import\frmImportContacts.cpp" />
-    <ClCompile Include="..\..\source\import\frmImportResults.cpp" />
-    <ClCompile Include="..\..\source\import\import-vcard3.cpp" />
-    <ClCompile Include="..\..\source\import\import-vcard4.cpp" />
-    <ClCompile Include="..\..\source\import\import.cpp" />
-    <ClCompile Include="..\..\source\main.cpp" />
-    <ClCompile Include="..\..\source\search\frmSearch-contact.cpp" />
-    <ClCompile Include="..\..\source\search\frmSearch-process.cpp" />
-    <ClCompile Include="..\..\source\search\frmSearch-result.cpp" />
-    <ClCompile Include="..\..\source\search\frmSearch.cpp" />
-    <ClCompile Include="..\..\source\search\frmSearchAccounts.cpp" />
-    <ClCompile Include="..\..\source\search\XABSearchPanel.cpp" />
-    <ClCompile Include="..\..\source\vcard\vcard.cpp" />
-    <ClCompile Include="..\..\source\vcard\vcard34conv-v3conv.cpp" />
-    <ClCompile Include="..\..\source\vcard\vcard34conv-v4conv.cpp" />
-    <ClCompile Include="..\..\source\vcard\vcard34conv.cpp" />
-    <ClCompile Include="..\..\source\widgets\XABAccountView.cpp" />
-    <ClCompile Include="..\..\source\widgets\XABContactMenu.cpp" />
-    <ClCompile Include="..\..\source\widgets\XABPriorityCtrl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="xestiaab.rc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>xestiaab</ProjectName>
-    <ProjectGuid>{853D1FD7-20AB-586C-9699-9680F84AC985}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <OutDir>vc_mswuddll\</OutDir>
-    <IntDir>vc_mswuddll\xestiaab_debug</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-    <TargetName>$(ProjectName)_debug</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <OutDir>vc_mswudll\</OutDir>
-    <IntDir>vc_mswudll\xestiaab</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <OutDir>vc_mswuddll_x64\</OutDir>
-    <IntDir>vc_mswuddll_x64\xestiaab_debug</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>true</GenerateManifest>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <TargetName>$(ProjectName)_debug</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <OutDir>vc_mswudll_x64\</OutDir>
-    <IntDir>vc_mswudll_x64\xestiaab</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT_DEBUG)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\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>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ProgramDataBaseFileName>vc_mswuddll\xestiaab_debug.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OmitFramePointers />
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <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/xestiaab_debug.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SFML_32BIT)\lib;$(LIBXML2_32BIT)\lib;$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswuddll\xestiaab_debug.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswuddll\xestiaab_debug_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-    <Xdcmake>
-      <OutputFile>$(OutDir)$(TargetName).xml</OutputFile>
-    </Xdcmake>
-    <PreBuildEvent>
-      <Command>$(TargetDir)bitmapcode.exe ..\..\source\bitmaps</Command>
-      <Message>Generating bitmaps as source code</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2;.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ProgramDataBaseFileName>vc_mswudll\xestiaab_debug.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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_mswudll\xestiaab.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SFML_32BIT)\lib;$(LIBXML2_32BIT)\lib;$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\lib;$(WXWIDGETS_32BIT)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswudll\xestiaab.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswudll\xestiaab_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-    <PreBuildEvent>
-      <Command>$(TargetDir)bitmapcode.exe ..\..\source\bitmaps</Command>
-      <Message>Generating bitmaps as source code</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <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>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ProgramDataBaseFileName>vc_mswuddll_x64\xestiaab_debug.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <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-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>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswuddll_x64\xestiaab_debug_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-    <PreBuildEvent>
-      <Command>$(TargetDir)bitmapcode.exe ..\..\source\bitmaps</Command>
-      <Message>Generating bitmaps as source code</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT)\include;$(SFML_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ObjectFileName>vc_mswudll_x64\minimal\</ObjectFileName>
-      <ProgramDataBaseFileName>vc_mswudll_x64\minimal.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_x64_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>wxmsw30u_core.lib;wxmsw30u_html.lib;wxbase30u.lib;wxmsw30u_adv.lib;libcurl.lib;libxml2.dll.a;sfml-audio.lib;sfml-system.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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_mswudll_x64\xestiaab.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)\lib\vc_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>vc_mswudll_x64\xestiaab.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <LinkStatus>true</LinkStatus>
-    </Link>
-    <Bscmake>
-      <OutputFile>vc_mswudll_x64\xestiaab_vc9.bsc</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-    <Xdcmake>
-      <DocumentLibraryDependencies>false</DocumentLibraryDependencies>
-    </Xdcmake>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <PreBuildEvent>
-      <Command>$(TargetDir)bitmapcode.exe ..\..\source\bitmaps</Command>
-      <Message>Generating bitmaps as source code</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/msw/xestiaab.vcxproj.filters b/projects/msw/xestiaab.vcxproj.filters
deleted file mode 100644 (file)
index b72ef45..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\AppXestiaAddrBk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\base64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\convert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\defaults.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\dirs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\etag.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\events.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\export\export.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\export\export-vcard3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\export\export-vcard4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\filename.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmAbout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\actmgr\frmActivityMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\actmgr\frmActivityMgr-tasks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmConflictResolution.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmContact.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorAddress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Business.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorCalAdr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Calendar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorCategory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Category.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorEmail.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Events.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-General.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorGeoposition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorGroups.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Groups.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Home.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorIM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Init.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Key.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorLanguages.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Load.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Logo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorNickname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorNotes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorOrganisations.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Other.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorPicture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Picture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorRelated.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Reset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorRoles.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Save.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorSound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Sound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTelephone.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTimezones.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorTitles.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorVendor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorWebsites.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\frmContactEditorXToken.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmEditAccount.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\import\frmImportContacts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\import\frmImportResults.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmInvalidSSLCertificate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmNewAccount.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmPreferences.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\frmSearch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\frmSearchAccounts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\frmSearch-contact.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\frmSearch-process.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\frmSearch-result.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmSSLCertificate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmUpdate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\getcontactinfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\import\import.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\import\import-vcard3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\import\import-vcard4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\mime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\preferences.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\svrblist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\textprocessing.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\timers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\uuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\vcard\vcard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\vcard\vcard34conv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\vcard\vcard34conv-v3conv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\vcard\vcard34conv-v4conv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\win32ssl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\widgets\XABAccountView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\widgets\XABContactMenu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\search\XABSearchPanel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\connobject\ConnectionObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\carddav2\carddav2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\frmNewAccount-CardDAV2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject-Save.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\languages.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\widgets\XABPriorityCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="xestiaab.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
index ddf96a4..87a6208 100644 (file)
@@ -35,12 +35,19 @@ set(FILE_LIST main.cpp
               frmUpdate.h)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-    list(APPEND ${FILE_LIST} frmEditAccount.mm
+    list(APPEND FILE_LIST frmEditAccount.mm
                              frmNewAccount.mm)
 endif()
 
-add_executable(xestiaab
-    ${FILE_LIST})
+if (MSVC)
+    list(APPEND FILE_LIST os/msw/xestiaab.rc)
+    add_executable(xestiaab WIN32
+        ${FILE_LIST})
+else()
+    add_executable(xestiaab
+        ${FILE_LIST})
+endif()
+
 
 message("${RUNTIME_OUTPUT_NAME_bitmapcode}")
 
@@ -50,22 +57,33 @@ target_include_directories(xestiaab
     
 add_dependencies(xestiaab bitmapcode)
     
+list(APPEND LIBRARIES ${wxWidgets_LIBRARIES}
+                      ${LIBXML2_LIBRARY}
+                      sfml-audio
+                      CURL::libcurl
+                      actmgr
+                      carddav2
+                      common
+                      contacteditor
+                      export
+                      import
+                      misc
+                      search
+                      vcard
+                      widgets)
+
+if (MSVC)
+    list(APPEND LIBRARIES wsock32
+                          wininet
+                          security
+                          cryptui
+                          crypt32)
+endif()
+
 target_link_libraries(xestiaab
     LINK_PUBLIC
-    ${wxWidgets_LIBRARIES}
-    ${LIBXML2_LIBRARY}
-    sfml-audio
-    CURL::libcurl
-    actmgr
-    carddav2
-    common
-    contacteditor
-    export
-    import
-    misc
-    search
-    vcard
-    widgets)
+    ${LIBRARIES}
+)
 
 file(GLOB DOCUMENTATION_INSTALL_FILES "${CMAKE_SOURCE_DIR}/../docs/*")
 foreach(ITEM ${DOCUMENTATION_INSTALL_FILES})
index 830bc74..4678364 100644 (file)
@@ -1,11 +1,18 @@
-find_package(wxWidgets REQUIRED html net adv core base)
+if (MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS -DSECURITY_WIN32 -DNOPCH -DWXUSINGDLL -DUNICODE)
+endif()
+
+find_package(wxWidgets REQUIRED html adv core base)
 include(${wxWidgets_USE_FILE})
 
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIRS})
 
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIR})
+
 find_package(CURL REQUIRED)
 include_directories(${CURL_INCLUDE_DIRS})
 
 find_package(SFML COMPONENTS audio REQUIRED)
-include_directories(${SFML_INCLUDE_DIR})
\ No newline at end of file
+include_directories(${SFML_DIR}/../include)
index 4e551f1..097c584 100644 (file)
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 project (xestiaab)
 
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/CMakeFunctions")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_CXX_STANDARD 11)
 include(Options)
 include(Packages)
index 552d13b..588c631 100644 (file)
@@ -1,6 +1,6 @@
 set(TARGET_NAME "common")
 
-set(FILE_LIST base64.cpp
+list(APPEND FILE_LIST base64.cpp
               base64.h
               CMakeLists.txt
               defaults.cpp
@@ -32,9 +32,9 @@ set(FILE_LIST base64.cpp
               uuid.cpp
               uuid.h)
 
-if(WIN32)
-    list(APPEND ${FILE_LIST} win32ssl.cpp
-                             win32ssl.h)
+if(MSVC)
+    list(APPEND FILE_LIST win32ssl.cpp
+                          win32ssl.h)
 endif()
 
 add_library(${TARGET_NAME}
index a06c9fd..1f374db 100644 (file)
@@ -205,7 +205,9 @@ void frmSSLCertificate::SetupCertsString(SSLCertCollectionString SSLCertsInc)
        std::map<string, string>::iterator Validiter = SCDIter->second.CertData.find("Start date");
        
        wxDateTime ValidFromDate;
-       ValidFromDate.ParseDate(Validiter->second);
+       const wxString validFromDateToParse = wxString(Validiter->second);
+       wxString::const_iterator validFromDateToParseEnd = validFromDateToParse.end();
+       ValidFromDate.ParseDateTime(validFromDateToParse, &validFromDateToParseEnd);
        
        lblValidFromData->SetLabel(ValidFromDate.FormatDate());
        
index 8de8c5a..a34ec67 100644 (file)
@@ -1,16 +1,18 @@
 add_executable(bitmapcode
     bitmapcode.cpp)
     
+if (MSVC)
 add_custom_command(
     TARGET bitmapcode
     POST_BUILD
-    COMMAND ${CMAKE_BINARY_DIR}/tools/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+    COMMAND $(OutDir)/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+endif()
     
 target_link_libraries(bitmapcode
     LINK_PUBLIC
     ${wxWidgets_LIBRARIES})
 
-add_executable(odthelpbrowser
+set (sources 
     odthelpbrowser/base64.cpp
     odthelpbrowser/base64.h
     odthelpbrowser/frmMain.cpp
@@ -21,8 +23,14 @@ add_executable(odthelpbrowser
     odthelpbrowser/ODTHelpBrowser.cpp
     odthelpbrowser/ODTHelpBrowser.h
     odthelpbrowser/version.h)
+
+if (WIN32)
+    add_executable(odthelpbrowser WIN32 ${sources})
+else()
+    add_executable(odthelpbrowser ${sources})
+endif()
     
 target_link_libraries(odthelpbrowser
     LINK_PUBLIC
     ${wxWidgets_LIBRARIES}
-    ${LIBXML2_LIBRARY})
\ No newline at end of file
+    ${LIBXML2_LIBRARY})
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy