OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a feature to set items saved to or restored from the project file. (#953)
[winmerge-jp/winmerge-jp.git] / Src / Merge.vcxproj
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index 235e9f5..806ddf1 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -1,1398 +1,1408 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Test|Win32">
-      <Configuration>Test</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Test|x64">
-      <Configuration>Test</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Merge</ProjectName>
-    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>
-    <RootNamespace>Merge</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='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)'=='Test|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)'=='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)'=='Debug|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)'=='Test|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)'=='Release|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>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EmbedManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>
-    <TargetName>Win$(ProjectName)U</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <Profile>false</Profile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <Profile>false</Profile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\asp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\autoit.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\basic.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\batch.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\crystallineparser.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\cplusplus.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cregexp_poco.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cs2cs.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\csharp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\css.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\dcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\filesup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\fortran.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\fpattern.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\go.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\html.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\icu.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ini.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\innosetup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\is.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\isx.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\java.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lisp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lua.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\memcombo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\nsis.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\pascal.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\perl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\php.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\plain.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\po.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\powershell.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\python.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\registry.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rexx.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rsrc.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ruby.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rust.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sgml.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sh.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\siod.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sql.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\string_util.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\verilog.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\vhdl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\wcwidth.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\xml.cpp" />
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xdiffi.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xemit.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xhistogram.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xmerge.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xpatience.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xprepare.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xutils.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="7zCommon.cpp">
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ImageCompare.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Concurrent.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp" />
-    <ClCompile Include="Common\Bitmap.cpp" />
-    <ClCompile Include="charsets.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirSelectFilesDlg.cpp" />
-    <ClCompile Include="SubstitutionFiltersList.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeFrameCommon.cpp" />
-    <ClCompile Include="MergeEditFrm.cpp" />
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp" />
-    <ClCompile Include="codepage_detect.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp" />
-    <ClCompile Include="Common\ExConverter.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareOptions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp" />
-    <ClCompile Include="CompareStats.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="ConfigLog.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />
-    <ClCompile Include="ConflictFileParser.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DropHandler.cpp" />
-    <ClCompile Include="ImgMergeFrm.cpp" />
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp" />
-    <ClCompile Include="MergeStatusBar.cpp" />
-    <ClCompile Include="OpenTableDlg.cpp" />
-    <ClCompile Include="OptionsDef.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffContext.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffFileData.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffFileInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffItem.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffItemList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffTextBuffer.cpp" />
-    <ClCompile Include="DiffThread.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffViewBar.cpp" />
-    <ClCompile Include="DiffWrapper.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirCmpReport.cpp" />
-    <ClCompile Include="DirCmpReportDlg.cpp" />
-    <ClCompile Include="DirColsDlg.cpp" />
-    <ClCompile Include="DirCompProgressBar.cpp" />
-    <ClCompile Include="DirDoc.cpp" />
-    <ClCompile Include="DirFrame.cpp" />
-    <ClCompile Include="DirItem.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirScan.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirTravel.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirView.cpp" />
-    <ClCompile Include="DirViewColItems.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="dllpstub.cpp" />
-    <ClCompile Include="EditorFilepathBar.cpp" />
-    <ClCompile Include="EncodingErrorBar.cpp" />
-    <ClCompile Include="Environment.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileActionScript.cpp" />
-    <ClCompile Include="FileFilter.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFilterHelper.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFilterMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp" />
-    <ClCompile Include="FileOrFolderSelect.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FilepathEdit.cpp" />
-    <ClCompile Include="FileTextEncoding.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileTransform.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileVersion.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FilterList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FolderCmp.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="GhostTextBuffer.cpp" />
-    <ClCompile Include="GhostTextView.cpp" />
-    <ClCompile Include="HexMergeDoc.cpp" />
-    <ClCompile Include="HexMergeFrm.cpp" />
-    <ClCompile Include="HexMergeView.cpp" />
-    <ClCompile Include="Common\LanguageSelect.cpp" />
-    <ClCompile Include="JumpList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp" />
-    <ClCompile Include="SubstitutionFiltersDlg.cpp" />
-    <ClCompile Include="SubeditList.cpp" />
-    <ClCompile Include="LineFiltersList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp" />
-    <ClCompile Include="locality.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LocationBar.cpp" />
-    <ClCompile Include="LocationView.cpp" />
-    <ClCompile Include="Common\lwdisp.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MainFrm.cpp" />
-    <ClCompile Include="markdown.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp" />
-    <ClCompile Include="Merge.cpp" />
-    <ClCompile Include="MergeApp.cpp" />
-    <ClCompile Include="MergeCmdLineInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeDoc.cpp" />
-    <ClCompile Include="MergeDocDiffSync.cpp" />
-    <ClCompile Include="MergeDocEncoding.cpp" />
-    <ClCompile Include="MergeDocLineDiffs.cpp" />
-    <ClCompile Include="MergeEditView.cpp" />
-    <ClCompile Include="Common\MessageBoxDialog.cpp" />
-    <ClCompile Include="MovedBlocks.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MovedLines.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OpenDoc.cpp" />
-    <ClCompile Include="OpenFrm.cpp" />
-    <ClCompile Include="OpenView.cpp" />
-    <ClCompile Include="OptionsDiffColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffOptions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsDirColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|ARM64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>ARM64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|ARM64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>ARM64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|ARM64">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>ARM64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|Win32">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|x64">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>Merge</ProjectName>\r
+    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
+    <RootNamespace>Merge</RootNamespace>\r
+    <Keyword>MFCProj</Keyword>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+    <Import Project="..\Externals\crystaledit\editlib\editlib.vcxitems" Label="Shared" />\r
+    <Import Project="..\Externals\xdiff\xdiff.vcxitems" Label="Shared" />\r
+    <Import Project="diffutils\diffutils.vcxitems" Label="Shared" />\r
+    <Import Project="CompareEngines\CompareEngines.vcxitems" Label="Shared" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</EmbedManifest>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'">true</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'">true</EmbedManifest>\r
+    <TargetName>Win$(ProjectName)U</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+      <Profile>true</Profile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <Profile>true</Profile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\libARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <Profile>true</Profile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\googletest\googletest\;..\Externals\googletest\googletest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\libARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\googletest\googletest\;..\Externals\googletest\googletest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|ARM64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\googletest\googletest\;..\Externals\googletest\googletest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\libARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="7zCommon.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="Common\IniOptionsMgr.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Shell.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Concurrent.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp" />\r
+    <ClCompile Include="Common\Bitmap.cpp" />\r
+    <ClCompile Include="charsets.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirSelectFilesDlg.cpp" />\r
+    <ClCompile Include="InternalPlugins.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PropMessageBoxes.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeFrameCommon.cpp" />\r
+    <ClCompile Include="MergeEditFrm.cpp" />\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp" />\r
+    <ClCompile Include="codepage_detect.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp" />\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareOptions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp" />\r
+    <ClCompile Include="CompareStats.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfigLog.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />\r
+    <ClCompile Include="ConflictFileParser.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DropHandler.cpp" />\r
+    <ClCompile Include="ImgMergeFrm.cpp" />\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditSplitterView.cpp" />\r
+    <ClCompile Include="MergeStatusBar.cpp" />\r
+    <ClCompile Include="OpenTableDlg.cpp" />\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffContext.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileData.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItem.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItemList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp" />\r
+    <ClCompile Include="DiffThread.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp" />\r
+    <ClCompile Include="DiffWrapper.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReport.cpp" />\r
+    <ClCompile Include="DirCmpReportDlg.cpp" />\r
+    <ClCompile Include="DirColsDlg.cpp" />\r
+    <ClCompile Include="DirCompProgressBar.cpp" />\r
+    <ClCompile Include="DirDoc.cpp" />\r
+    <ClCompile Include="DirFrame.cpp" />\r
+    <ClCompile Include="DirItem.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirScan.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirTravel.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirView.cpp" />\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="dllpstub.cpp" />\r
+    <ClCompile Include="EditorFilepathBar.cpp" />\r
+    <ClCompile Include="EncodingErrorBar.cpp" />\r
+    <ClCompile Include="Environment.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp" />\r
+    <ClCompile Include="FileFilter.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterHelper.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp" />\r
+    <ClCompile Include="FileFlags.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp" />\r
+    <ClCompile Include="FileTextEncoding.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTransform.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileVersion.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FolderCmp.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp" />\r
+    <ClCompile Include="GhostTextView.cpp" />\r
+    <ClCompile Include="HexMergeDoc.cpp" />\r
+    <ClCompile Include="HexMergeFrm.cpp" />\r
+    <ClCompile Include="HexMergeView.cpp" />\r
+    <ClCompile Include="Common\LanguageSelect.cpp" />\r
+    <ClCompile Include="JumpList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp" />\r
+    <ClCompile Include="SubeditList.cpp" />\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp" />\r
+    <ClCompile Include="locality.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp" />\r
+    <ClCompile Include="LocationView.cpp" />\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp" />\r
+    <ClCompile Include="markdown.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp" />\r
+    <ClCompile Include="Merge.cpp" />\r
+    <ClCompile Include="MergeApp.cpp" />\r
+    <ClCompile Include="MergeCmdLineInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp" />\r
+    <ClCompile Include="MergeDocDiffSync.cpp" />\r
+    <ClCompile Include="MergeDocEncoding.cpp" />\r
+    <ClCompile Include="MergeDocLineDiffs.cpp" />\r
+    <ClCompile Include="MergeEditView.cpp" />\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp" />\r
+    <ClCompile Include="MovedBlocks.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedLines.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp" />\r
+    <ClCompile Include="OpenFrm.cpp" />\r
+    <ClCompile Include="OpenView.cpp" />\r
+    <ClCompile Include="OptionsDiffColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffOptions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDirColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
     <ClCompile Include="OptionsEditorSyntax.cpp">\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsFont.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsInit.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="OptionsSyntaxColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp" />
-    <ClCompile Include="PatchHTML.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp" />
-    <ClCompile Include="PathContext.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="paths.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PluginManager.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Plugins.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp" />
-    <ClCompile Include="Common\PreferencesDlg.cpp" />
-    <ClCompile Include="ProjectFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PropArchive.cpp" />
-    <ClCompile Include="PropBackups.cpp" />
-    <ClCompile Include="PropCodepage.cpp" />
-    <ClCompile Include="PropColorSchemes.cpp" />
-    <ClCompile Include="PropCompareTable.cpp" />
+    <ClCompile Include="OptionsFont.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsInit.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsProject.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsSyntaxColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp" />\r
+    <ClCompile Include="PatchHTML.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp" />\r
+    <ClCompile Include="PathContext.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="paths.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="pch.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginManager.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Plugins.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp" />\r
+    <ClCompile Include="Common\PreferencesDlg.cpp" />\r
+    <ClCompile Include="ProjectFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PropArchive.cpp" />\r
+    <ClCompile Include="PropBackups.cpp" />\r
+    <ClCompile Include="PropCodepage.cpp" />\r
+    <ClCompile Include="PropColorSchemes.cpp" />\r
+    <ClCompile Include="PropCompareTable.cpp" />\r
     <ClCompile Include="PropEditorSyntax.cpp" />\r
-    <ClCompile Include="PropMergeColors.cpp" />
-    <ClCompile Include="PropCompare.cpp" />
-    <ClCompile Include="PropCompareBinary.cpp" />
-    <ClCompile Include="PropCompareFolder.cpp" />
-    <ClCompile Include="PropCompareImage.cpp" />
-    <ClCompile Include="PropDirColors.cpp" />
-    <ClCompile Include="PropEditor.cpp" />
-    <ClCompile Include="Common\PropertyPageHost.cpp" />
-    <ClCompile Include="PropGeneral.cpp" />
-    <ClCompile Include="PropMarkerColors.cpp" />
-    <ClCompile Include="PropRegistry.cpp" />
-    <ClCompile Include="PropShell.cpp" />
-    <ClCompile Include="PropSyntaxColors.cpp" />
-    <ClCompile Include="PropTextColors.cpp" />
-    <ClCompile Include="Common\RegKey.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp" />
-    <ClCompile Include="Common\scbarcf.cpp" />
-    <ClCompile Include="Common\scbarg.cpp" />
-    <ClCompile Include="SelectUnpackerDlg.cpp" />
-    <ClCompile Include="SharedFilterDlg.cpp" />
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp" />
-    <ClCompile Include="Common\SortHeaderCtrl.cpp" />
-    <ClCompile Include="Common\SplitterWndEx.cpp" />
-    <ClCompile Include="StdAfx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="stringdiffs.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp" />
-    <ClCompile Include="SubstitutionList.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="TempFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Test.cpp" />
-    <ClCompile Include="TestFilterDlg.cpp" />
-    <ClCompile Include="Common\unicoder.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp" />
-    <ClCompile Include="TrDialogs.cpp" />
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="WildcardDropList.cpp" />
-    <ClCompile Include="WindowsManagerDialog.cpp" />
-    <ClCompile Include="WMGotoDlg.cpp" />
-    <ClCompile Include="diffutils\src\analyze.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\lib\cmpbuf.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\context.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\Diff.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ed.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\GnuVersion.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ifdef.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\io.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\normal.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\side.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\util.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="xdiff_gnudiff_compat.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Externals\boost\boost\config.hpp" />
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp" />
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderer.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\hqbitmap.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cregexp.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cs2cs.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\filesup.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\fpattern.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\icu.hpp" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\memcombo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\registry.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\string_util.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\wcwidth.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xdiff.h" />
-    <ClInclude Include="..\Externals\xdiff\xdiffi.h" />
-    <ClInclude Include="..\Externals\xdiff\xemit.h" />
-    <ClInclude Include="..\Externals\xdiff\xinclude.h" />
-    <ClInclude Include="..\Externals\xdiff\xmacros.h" />
-    <ClInclude Include="..\Externals\xdiff\xprepare.h" />
-    <ClInclude Include="..\Externals\xdiff\xtypes.h" />
-    <ClInclude Include="..\Externals\xdiff\xutils.h" />
-    <ClInclude Include="..\Version.h" />
-    <ClInclude Include="7zCommon.h" />
-    <ClInclude Include="AboutDlg.h" />
-    <ClInclude Include="CompareEngines\ImageCompare.h" />
-    <ClInclude Include="Concurrent.h" />
-    <ClInclude Include="Common\BCMenu.h" />
-    <ClInclude Include="Common\Bitmap.h" />
-    <ClInclude Include="charsets.h" />
-    <ClInclude Include="DirSelectFilesDlg.h" />
-    <ClInclude Include="SubstitutionFiltersList.h" />
-    <ClInclude Include="MergeFrameCommon.h" />
-    <ClInclude Include="MergeEditFrm.h" />
-    <ClInclude Include="Common\ClipBoard.h" />
-    <ClInclude Include="Common\CMoveConstraint.h" />
-    <ClInclude Include="codepage_detect.h" />
-    <ClInclude Include="Common\ColorButton.h" />
-    <ClInclude Include="Common\ExConverter.h" />
-    <ClInclude Include="CompareEngines\BinaryCompare.h" />
-    <ClInclude Include="CompareOptions.h" />
-    <ClInclude Include="CompareStatisticsDlg.h" />
-    <ClInclude Include="CompareStats.h" />
-    <ClInclude Include="ConfigLog.h" />
-    <ClInclude Include="ConfirmFolderCopyDlg.h" />
-    <ClInclude Include="ConflictFileParser.h" />
-    <ClInclude Include="Common\coretools.h" />
-    <ClInclude Include="Constants.h" />
-    <ClInclude Include="DirActions.h" />
-    <ClInclude Include="HexMergeView.h" />
-    <ClInclude Include="DropHandler.h" />
-    <ClInclude Include="IMergeDoc.h" />
-    <ClInclude Include="ImgMergeFrm.h" />
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />
-    <ClInclude Include="Merge7zFormatRegister.h" />
-    <ClInclude Include="Merge7zFormatShellImpl.h" />
-    <ClInclude Include="MergeEditSplitterView.h" />
-    <ClInclude Include="MergeStatusBar.h" />
-    <ClInclude Include="OpenTableDlg.h" />
-    <ClInclude Include="OptionsCustomColors.h" />
-    <ClInclude Include="Diff3.h" />
-    <ClInclude Include="DiffContext.h" />
-    <ClInclude Include="DiffFileData.h" />
-    <ClInclude Include="DiffFileInfo.h" />
-    <ClInclude Include="DiffItem.h" />
-    <ClInclude Include="DiffItemList.h" />
-    <ClInclude Include="DiffList.h" />
-    <ClInclude Include="DiffTextBuffer.h" />
-    <ClInclude Include="DiffThread.h" />
-    <ClInclude Include="DiffViewBar.h" />
-    <ClInclude Include="DiffWrapper.h" />
-    <ClInclude Include="DirCmpReport.h" />
-    <ClInclude Include="DirCmpReportDlg.h" />
-    <ClInclude Include="DirColsDlg.h" />
-    <ClInclude Include="DirCompProgressBar.h" />
-    <ClInclude Include="DirDoc.h" />
-    <ClInclude Include="DirFrame.h" />
-    <ClInclude Include="DirItem.h" />
-    <ClInclude Include="DirReportTypes.h" />
-    <ClInclude Include="DirScan.h" />
-    <ClInclude Include="DirTravel.h" />
-    <ClInclude Include="DirView.h" />
-    <ClInclude Include="DirViewColItems.h" />
-    <ClInclude Include="dllpstub.h" />
-    <ClInclude Include="EditorFilepathBar.h" />
-    <ClInclude Include="EncodingErrorBar.h" />
-    <ClInclude Include="Environment.h" />
-    <ClInclude Include="Exceptions.h" />
-    <ClInclude Include="FileActionScript.h" />
-    <ClInclude Include="FileFilter.h" />
-    <ClInclude Include="FileFilterHelper.h" />
-    <ClInclude Include="FileFilterMgr.h" />
-    <ClInclude Include="FileFiltersDlg.h" />
-    <ClInclude Include="FileLocation.h" />
-    <ClInclude Include="FileOrFolderSelect.h" />
-    <ClInclude Include="FilepathEdit.h" />
-    <ClInclude Include="files.h" />
-    <ClInclude Include="FileTextEncoding.h" />
-    <ClInclude Include="FileTextStats.h" />
-    <ClInclude Include="FileTransform.h" />
-    <ClInclude Include="FileVersion.h" />
-    <ClInclude Include="FilterList.h" />
-    <ClInclude Include="FolderCmp.h" />
-    <ClInclude Include="GhostTextBuffer.h" />
-    <ClInclude Include="GhostTextView.h" />
-    <ClInclude Include="HexMergeDoc.h" />
-    <ClInclude Include="HexMergeFrm.h" />
-    <ClInclude Include="heksedit.h" />
-    <ClInclude Include="IAbortable.h" />
-    <ClInclude Include="IListCtrlImpl.h" />
-    <ClInclude Include="IntToIntMap.h" />
-    <ClInclude Include="IOptionsPanel.h" />
-    <ClInclude Include="Common\LanguageSelect.h" />
-    <ClInclude Include="JumpList.h" />
-    <ClInclude Include="LineFiltersDlg.h" />
-    <ClInclude Include="SubstitutionFiltersDlg.h" />
-    <ClInclude Include="LineFiltersList.h" />
-    <ClInclude Include="SubstitutionList.h" />
-    <ClInclude Include="LoadSaveCodepageDlg.h" />
-    <ClInclude Include="locality.h" />
-    <ClInclude Include="LocationBar.h" />
-    <ClInclude Include="LocationView.h" />
-    <ClInclude Include="Common\lwdisp.h" />
-    <ClInclude Include="MainFrm.h" />
-    <ClInclude Include="markdown.h" />
-    <ClInclude Include="Common\MDITabBar.h" />
-    <ClInclude Include="Common\memdc.h" />
-    <ClInclude Include="Merge.h" />
-    <ClInclude Include="MergeApp.h" />
-    <ClInclude Include="MergeCmdLineInfo.h" />
-    <ClInclude Include="MergeDoc.h" />
-    <ClInclude Include="MergeEditStatus.h" />
-    <ClInclude Include="MergeEditView.h" />
-    <ClInclude Include="MergeLineFlags.h" />
-    <ClInclude Include="Common\MessageBoxDialog.h" />
-    <ClInclude Include="MovedLines.h" />
-    <ClInclude Include="Common\multiformatText.h" />
-    <ClInclude Include="OpenDoc.h" />
-    <ClInclude Include="OpenFrm.h" />
-    <ClInclude Include="OpenView.h" />
-    <ClInclude Include="OptionsDef.h" />
-    <ClInclude Include="common\OptionsMgr.h" />
-    <ClInclude Include="OptionsDiffColors.h" />
-    <ClInclude Include="OptionsDiffOptions.h" />
-    <ClInclude Include="OptionsDirColors.h" />
+    <ClCompile Include="PropMergeColors.cpp" />\r
+    <ClCompile Include="PropCompare.cpp" />\r
+    <ClCompile Include="PropCompareBinary.cpp" />\r
+    <ClCompile Include="PropCompareFolder.cpp" />\r
+    <ClCompile Include="PropCompareImage.cpp" />\r
+    <ClCompile Include="PropDirColors.cpp" />\r
+    <ClCompile Include="PropEditor.cpp" />\r
+    <ClCompile Include="Common\PropertyPageHost.cpp" />\r
+    <ClCompile Include="PropGeneral.cpp" />\r
+    <ClCompile Include="PropMarkerColors.cpp" />\r
+    <ClCompile Include="PropProject.cpp" />\r
+    <ClCompile Include="PropRegistry.cpp" />\r
+    <ClCompile Include="PropShell.cpp" />\r
+    <ClCompile Include="PropSyntaxColors.cpp" />\r
+    <ClCompile Include="PropTextColors.cpp" />\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp" />\r
+    <ClCompile Include="Common\scbarcf.cpp" />\r
+    <ClCompile Include="Common\scbarg.cpp" />\r
+    <ClCompile Include="SelectPluginDlg.cpp" />\r
+    <ClCompile Include="SharedFilterDlg.cpp" />\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp" />\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp" />\r
+    <ClCompile Include="Common\SplitterWndEx.cpp" />\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="stringdiffs.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp" />\r
+    <ClCompile Include="SubstitutionList.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="TempFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Test.cpp" />\r
+    <ClCompile Include="TestFilterDlg.cpp" />\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp" />\r
+    <ClCompile Include="TrDialogs.cpp" />\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="WildcardDropList.cpp" />\r
+    <ClCompile Include="WindowsManagerDialog.cpp" />\r
+    <ClCompile Include="WMGotoDlg.cpp" />\r
+    <ClCompile Include="xdiff_gnudiff_compat.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\Externals\boost\boost\config.hpp" />\r
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp" />\r
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp" />\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Version.h" />\r
+    <ClInclude Include="7zCommon.h" />\r
+    <ClInclude Include="AboutDlg.h" />\r
+    <ClInclude Include="Common\IniOptionsMgr.h" />\r
+    <ClInclude Include="Common\Shell.h" />\r
+    <ClInclude Include="Concurrent.h" />\r
+    <ClInclude Include="Common\BCMenu.h" />\r
+    <ClInclude Include="Common\Bitmap.h" />\r
+    <ClInclude Include="charsets.h" />\r
+    <ClInclude Include="DirSelectFilesDlg.h" />\r
+    <ClInclude Include="PropMessageBoxes.h" />\r
+    <ClInclude Include="SubstitutionFiltersList.h" />\r
+    <ClInclude Include="MergeFrameCommon.h" />\r
+    <ClInclude Include="MergeEditFrm.h" />\r
+    <ClInclude Include="Common\ClipBoard.h" />\r
+    <ClInclude Include="Common\CMoveConstraint.h" />\r
+    <ClInclude Include="codepage_detect.h" />\r
+    <ClInclude Include="Common\ColorButton.h" />\r
+    <ClInclude Include="Common\ExConverter.h" />\r
+    <ClInclude Include="CompareOptions.h" />\r
+    <ClInclude Include="CompareStatisticsDlg.h" />\r
+    <ClInclude Include="CompareStats.h" />\r
+    <ClInclude Include="ConfigLog.h" />\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h" />\r
+    <ClInclude Include="ConflictFileParser.h" />\r
+    <ClInclude Include="Common\coretools.h" />\r
+    <ClInclude Include="Constants.h" />\r
+    <ClInclude Include="DirActions.h" />\r
+    <ClInclude Include="HexMergeView.h" />\r
+    <ClInclude Include="DropHandler.h" />\r
+    <ClInclude Include="IMergeDoc.h" />\r
+    <ClInclude Include="ImgMergeFrm.h" />\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />\r
+    <ClInclude Include="Merge7zFormatRegister.h" />\r
+    <ClInclude Include="Merge7zFormatShellImpl.h" />\r
+    <ClInclude Include="MergeEditSplitterView.h" />\r
+    <ClInclude Include="MergeStatusBar.h" />\r
+    <ClInclude Include="OpenTableDlg.h" />\r
+    <ClInclude Include="OptionsCustomColors.h" />\r
+    <ClInclude Include="Diff3.h" />\r
+    <ClInclude Include="DiffContext.h" />\r
+    <ClInclude Include="DiffFileData.h" />\r
+    <ClInclude Include="DiffFileInfo.h" />\r
+    <ClInclude Include="DiffItem.h" />\r
+    <ClInclude Include="DiffItemList.h" />\r
+    <ClInclude Include="DiffList.h" />\r
+    <ClInclude Include="DiffTextBuffer.h" />\r
+    <ClInclude Include="DiffThread.h" />\r
+    <ClInclude Include="DiffViewBar.h" />\r
+    <ClInclude Include="DiffWrapper.h" />\r
+    <ClInclude Include="DirCmpReport.h" />\r
+    <ClInclude Include="DirCmpReportDlg.h" />\r
+    <ClInclude Include="DirColsDlg.h" />\r
+    <ClInclude Include="DirCompProgressBar.h" />\r
+    <ClInclude Include="DirDoc.h" />\r
+    <ClInclude Include="DirFrame.h" />\r
+    <ClInclude Include="DirItem.h" />\r
+    <ClInclude Include="DirReportTypes.h" />\r
+    <ClInclude Include="DirScan.h" />\r
+    <ClInclude Include="DirTravel.h" />\r
+    <ClInclude Include="DirView.h" />\r
+    <ClInclude Include="DirViewColItems.h" />\r
+    <ClInclude Include="dllpstub.h" />\r
+    <ClInclude Include="EditorFilepathBar.h" />\r
+    <ClInclude Include="EncodingErrorBar.h" />\r
+    <ClInclude Include="Environment.h" />\r
+    <ClInclude Include="Exceptions.h" />\r
+    <ClInclude Include="FileActionScript.h" />\r
+    <ClInclude Include="FileFilter.h" />\r
+    <ClInclude Include="FileFilterHelper.h" />\r
+    <ClInclude Include="FileFilterMgr.h" />\r
+    <ClInclude Include="FileFiltersDlg.h" />\r
+    <ClInclude Include="FileFlags.h" />\r
+    <ClInclude Include="FileLocation.h" />\r
+    <ClInclude Include="FileOrFolderSelect.h" />\r
+    <ClInclude Include="FilepathEdit.h" />\r
+    <ClInclude Include="files.h" />\r
+    <ClInclude Include="FileTextEncoding.h" />\r
+    <ClInclude Include="FileTextStats.h" />\r
+    <ClInclude Include="FileTransform.h" />\r
+    <ClInclude Include="FileVersion.h" />\r
+    <ClInclude Include="FilterList.h" />\r
+    <ClInclude Include="FolderCmp.h" />\r
+    <ClInclude Include="GhostTextBuffer.h" />\r
+    <ClInclude Include="GhostTextView.h" />\r
+    <ClInclude Include="HexMergeDoc.h" />\r
+    <ClInclude Include="HexMergeFrm.h" />\r
+    <ClInclude Include="heksedit.h" />\r
+    <ClInclude Include="IAbortable.h" />\r
+    <ClInclude Include="IListCtrlImpl.h" />\r
+    <ClInclude Include="IntToIntMap.h" />\r
+    <ClInclude Include="IOptionsPanel.h" />\r
+    <ClInclude Include="Common\LanguageSelect.h" />\r
+    <ClInclude Include="JumpList.h" />\r
+    <ClInclude Include="LineFiltersDlg.h" />\r
+    <ClInclude Include="SubstitutionFiltersDlg.h" />\r
+    <ClInclude Include="LineFiltersList.h" />\r
+    <ClInclude Include="SubstitutionList.h" />\r
+    <ClInclude Include="LoadSaveCodepageDlg.h" />\r
+    <ClInclude Include="locality.h" />\r
+    <ClInclude Include="LocationBar.h" />\r
+    <ClInclude Include="LocationView.h" />\r
+    <ClInclude Include="Common\lwdisp.h" />\r
+    <ClInclude Include="MainFrm.h" />\r
+    <ClInclude Include="markdown.h" />\r
+    <ClInclude Include="Common\MDITabBar.h" />\r
+    <ClInclude Include="Common\memdc.h" />\r
+    <ClInclude Include="Merge.h" />\r
+    <ClInclude Include="MergeApp.h" />\r
+    <ClInclude Include="MergeCmdLineInfo.h" />\r
+    <ClInclude Include="MergeDoc.h" />\r
+    <ClInclude Include="MergeEditStatus.h" />\r
+    <ClInclude Include="MergeEditView.h" />\r
+    <ClInclude Include="MergeLineFlags.h" />\r
+    <ClInclude Include="Common\MessageBoxDialog.h" />\r
+    <ClInclude Include="MovedLines.h" />\r
+    <ClInclude Include="Common\multiformatText.h" />\r
+    <ClInclude Include="OpenDoc.h" />\r
+    <ClInclude Include="OpenFrm.h" />\r
+    <ClInclude Include="OpenView.h" />\r
+    <ClInclude Include="OptionsDef.h" />\r
+    <ClInclude Include="common\OptionsMgr.h" />\r
+    <ClInclude Include="OptionsDiffColors.h" />\r
+    <ClInclude Include="OptionsDiffOptions.h" />\r
+    <ClInclude Include="OptionsDirColors.h" />\r
     <ClInclude Include="OptionsEditorSyntax.h" />\r
-    <ClInclude Include="OptionsFont.h" />
-    <ClInclude Include="OptionsInit.h" />
-    <ClInclude Include="OptionsPanel.h" />
-    <ClInclude Include="OptionsSyntaxColors.h" />
-    <ClInclude Include="PatchDlg.h" />
-    <ClInclude Include="PatchHTML.h" />
-    <ClInclude Include="PatchTool.h" />
-    <ClInclude Include="PathContext.h" />
-    <ClInclude Include="paths.h" />
-    <ClInclude Include="Common\PidlContainer.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="PluginManager.h" />
-    <ClInclude Include="Plugins.h" />
-    <ClInclude Include="PluginsListDlg.h" />
-    <ClInclude Include="Common\PreferencesDlg.h" />
-    <ClInclude Include="ProjectFile.h" />
-    <ClInclude Include="PropArchive.h" />
-    <ClInclude Include="PropBackups.h" />
-    <ClInclude Include="PropCodepage.h" />
-    <ClInclude Include="PropColorSchemes.h" />
-    <ClInclude Include="PropCompareTable.h" />
+    <ClInclude Include="OptionsFont.h" />\r
+    <ClInclude Include="OptionsInit.h" />\r
+    <ClInclude Include="OptionsPanel.h" />\r
+    <ClInclude Include="OptionsProject.h" />\r
+    <ClInclude Include="OptionsSyntaxColors.h" />\r
+    <ClInclude Include="PatchDlg.h" />\r
+    <ClInclude Include="PatchHTML.h" />\r
+    <ClInclude Include="PatchTool.h" />\r
+    <ClInclude Include="PathContext.h" />\r
+    <ClInclude Include="paths.h" />\r
+    <ClInclude Include="Common\PidlContainer.h" />\r
+    <ClInclude Include="pch.h" />\r
+    <ClInclude Include="PluginManager.h" />\r
+    <ClInclude Include="Plugins.h" />\r
+    <ClInclude Include="PluginsListDlg.h" />\r
+    <ClInclude Include="Common\PreferencesDlg.h" />\r
+    <ClInclude Include="ProjectFile.h" />\r
+    <ClInclude Include="PropArchive.h" />\r
+    <ClInclude Include="PropBackups.h" />\r
+    <ClInclude Include="PropCodepage.h" />\r
+    <ClInclude Include="PropColorSchemes.h" />\r
+    <ClInclude Include="PropCompareTable.h" />\r
     <ClInclude Include="PropEditorSyntax.h" />\r
-    <ClInclude Include="PropMergeColors.h" />
-    <ClInclude Include="PropCompare.h" />
-    <ClInclude Include="PropCompareBinary.h" />
-    <ClInclude Include="PropCompareFolder.h" />
-    <ClInclude Include="PropCompareImage.h" />
-    <ClInclude Include="PropDirColors.h" />
-    <ClInclude Include="PropEditor.h" />
-    <ClInclude Include="Common\PropertyPageHost.h" />
-    <ClInclude Include="PropGeneral.h" />
-    <ClInclude Include="PropMarkerColors.h" />
-    <ClInclude Include="PropRegistry.h" />
-    <ClInclude Include="PropShell.h" />
-    <ClInclude Include="PropSyntaxColors.h" />
-    <ClInclude Include="PropTextColors.h" />
-    <ClInclude Include="Common\RegKey.h" />
-    <ClInclude Include="Common\RegOptionsMgr.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="SaveClosingDlg.h" />
-    <ClInclude Include="Common\scbarcf.h" />
-    <ClInclude Include="Common\scbarg.h" />
-    <ClInclude Include="SelectUnpackerDlg.h" />
-    <ClInclude Include="SharedFilterDlg.h" />
-    <ClInclude Include="Common\ShellContextMenu.h" />
-    <ClInclude Include="Common\ShellFileOperations.h" />
-    <ClInclude Include="Common\sizecbar.h" />
-    <ClInclude Include="Common\SortHeaderCtrl.h" />
-    <ClInclude Include="Common\SplitterWndEx.h" />
-    <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="stringdiffs.h" />
-    <ClInclude Include="stringdiffsi.h" />
-    <ClInclude Include="Common\SuperComboBox.h" />
-    <ClInclude Include="TempFile.h" />
-    <ClInclude Include="TestMain.h" />
-    <ClInclude Include="TestFilterDlg.h" />
-    <ClInclude Include="Common\unicoder.h" />
-    <ClInclude Include="Common\UnicodeString.h" />
-    <ClInclude Include="Common\UniFile.h" />
-    <ClInclude Include="TrDialogs.h" />
-    <ClInclude Include="UniMarkdownFile.h" />
-    <ClInclude Include="Common\varprop.h" />
-    <ClInclude Include="Common\VersionInfo.h" />
-    <ClInclude Include="WildcardDropList.h" />
-    <ClInclude Include="WindowsManagerDialog.h" />
-    <ClInclude Include="Win_VersionHelper.h" />
-    <ClInclude Include="WMGotoDlg.h" />
-    <ClInclude Include="diffutils\lib\cmpbuf.h" />
-    <ClInclude Include="diffutils\config.h" />
-    <ClInclude Include="diffutils\src\diff.h" />
-    <ClInclude Include="diffutils\src\system.h" />
-    <ClInclude Include="CompareEngines\ByteComparator.h" />
-    <ClInclude Include="CompareEngines\ByteCompare.h" />
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h" />
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />
-    <ClInclude Include="xdiff_gnudiff_compat.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\binarydiff.ico" />
-    <None Include="res\both.bmp" />
-    <None Include="res\equalbinary.ico" />
-    <None Include="res\equalfile.ico" />
-    <None Include="res\error.ico" />
-    <None Include="res\fileskip.ico" />
-    <None Include="res\folder.ico" />
-    <None Include="res\folderskip.ico" />
-    <None Include="res\folderup.ico" />
-    <None Include="res\folderup_disable.ico" />
-    <None Include="res\hand.cur" />
-    <None Include="res\left.bmp" />
-    <None Include="res\left_to_browse.bmp" />
-    <None Include="res\left_to_right.bmp" />
-    <None Include="res\lfile.ico" />
-    <None Include="res\lfolder.ico" />
-    <None Include="res\Merge.ico" />
-    <None Include="res\Merge.rc2" />
-    <None Include="res\MergeDir.ico" />
-    <None Include="res\MergeDoc.ico" />
-    <None Include="res\MergeProject.ico" />
-    <None Include="res\mg_cur.cur" />
-    <None Include="res\move_left_to_browse.bmp" />
-    <None Include="res\move_right_to_browse.bmp" />
-    <None Include="res\notequalfile.ico" />
-    <None Include="res\rfile.ico" />
-    <None Include="res\rfolder.ico" />
-    <None Include="res\right.bmp" />
-    <None Include="res\right_to_browse.bmp" />
-    <None Include="res\right_to_left.bmp" />
-    <None Include="res\sigma.ico" />
-    <None Include="CHANGELO" />
-    <None Include="..\Docs\Users\ChangeLog.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Merge.rc" />
-    <ResourceCompile Include="Merge2.rc">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ResourceCompile>
-  </ItemGroup>
-  <Target Name="CopyVisualElements" AfterTargets="Build">
-    <ItemGroup>
-      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />
-      <LogoImages Include="res\LogoImages\*.png" />
-    </ItemGroup>
-    <Message Text="Copy visual elements to $(OutDir)" />
-    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />
-    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />
-  </Target>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="Merge.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
+    <ClInclude Include="PropMergeColors.h" />\r
+    <ClInclude Include="PropCompare.h" />\r
+    <ClInclude Include="PropCompareBinary.h" />\r
+    <ClInclude Include="PropCompareFolder.h" />\r
+    <ClInclude Include="PropCompareImage.h" />\r
+    <ClInclude Include="PropDirColors.h" />\r
+    <ClInclude Include="PropEditor.h" />\r
+    <ClInclude Include="Common\PropertyPageHost.h" />\r
+    <ClInclude Include="PropGeneral.h" />\r
+    <ClInclude Include="PropMarkerColors.h" />\r
+    <ClInclude Include="PropProject.h" />\r
+    <ClInclude Include="PropRegistry.h" />\r
+    <ClInclude Include="PropShell.h" />\r
+    <ClInclude Include="PropSyntaxColors.h" />\r
+    <ClInclude Include="PropTextColors.h" />\r
+    <ClInclude Include="Common\RegKey.h" />\r
+    <ClInclude Include="Common\RegOptionsMgr.h" />\r
+    <ClInclude Include="Resource.h" />\r
+    <ClInclude Include="SaveClosingDlg.h" />\r
+    <ClInclude Include="Common\scbarcf.h" />\r
+    <ClInclude Include="Common\scbarg.h" />\r
+    <ClInclude Include="SelectPluginDlg.h" />\r
+    <ClInclude Include="SharedFilterDlg.h" />\r
+    <ClInclude Include="Common\ShellContextMenu.h" />\r
+    <ClInclude Include="Common\ShellFileOperations.h" />\r
+    <ClInclude Include="Common\sizecbar.h" />\r
+    <ClInclude Include="Common\SortHeaderCtrl.h" />\r
+    <ClInclude Include="Common\SplitterWndEx.h" />\r
+    <ClInclude Include="StdAfx.h" />\r
+    <ClInclude Include="stringdiffs.h" />\r
+    <ClInclude Include="stringdiffsi.h" />\r
+    <ClInclude Include="Common\SuperComboBox.h" />\r
+    <ClInclude Include="TempFile.h" />\r
+    <ClInclude Include="TestMain.h" />\r
+    <ClInclude Include="TestFilterDlg.h" />\r
+    <ClInclude Include="Common\unicoder.h" />\r
+    <ClInclude Include="Common\UnicodeString.h" />\r
+    <ClInclude Include="Common\UniFile.h" />\r
+    <ClInclude Include="TrDialogs.h" />\r
+    <ClInclude Include="Common\varprop.h" />\r
+    <ClInclude Include="Common\VersionInfo.h" />\r
+    <ClInclude Include="WildcardDropList.h" />\r
+    <ClInclude Include="WindowsManagerDialog.h" />\r
+    <ClInclude Include="WinMergePluginBase.h" />\r
+    <ClInclude Include="Win_VersionHelper.h" />\r
+    <ClInclude Include="WMGotoDlg.h" />\r
+    <ClInclude Include="xdiff_gnudiff_compat.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\binarydiff.ico" />\r
+    <None Include="res\both.bmp" />\r
+    <None Include="res\equalbinary.ico" />\r
+    <None Include="res\equalfile.ico" />\r
+    <None Include="res\error.ico" />\r
+    <None Include="res\fileskip.ico" />\r
+    <None Include="res\folder.ico" />\r
+    <None Include="res\folderskip.ico" />\r
+    <None Include="res\folderup.ico" />\r
+    <None Include="res\folderup_disable.ico" />\r
+    <None Include="res\hand.cur" />\r
+    <None Include="res\left.bmp" />\r
+    <None Include="res\left_to_browse.bmp" />\r
+    <None Include="res\left_to_right.bmp" />\r
+    <None Include="res\lfile.ico" />\r
+    <None Include="res\lfolder.ico" />\r
+    <None Include="res\Merge.ico" />\r
+    <None Include="res\Merge.rc2" />\r
+    <None Include="res\MergeDir.ico" />\r
+    <None Include="res\MergeDoc.ico" />\r
+    <None Include="res\MergeProject.ico" />\r
+    <None Include="res\mg_cur.cur" />\r
+    <None Include="res\move_left_to_browse.bmp" />\r
+    <None Include="res\move_right_to_browse.bmp" />\r
+    <None Include="res\notequalfile.ico" />\r
+    <None Include="res\rfile.ico" />\r
+    <None Include="res\rfolder.ico" />\r
+    <None Include="res\right.bmp" />\r
+    <None Include="res\right_to_browse.bmp" />\r
+    <None Include="res\right_to_left.bmp" />\r
+    <None Include="res\sigma.ico" />\r
+    <None Include="..\Docs\Users\ChangeLog.md" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="Merge.rc" />\r
+    <ResourceCompile Include="Merge2.rc">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <Target Name="CopyVisualElements" AfterTargets="Build">\r
+    <ItemGroup>\r
+      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />\r
+      <LogoImages Include="res\LogoImages\*.png" />\r
+    </ItemGroup>\r
+    <Message Text="Copy visual elements to $(OutDir)" />\r
+    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />\r
+    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />\r
+  </Target>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties RESOURCE_FILE="Merge.rc" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file
About OSDN
Find Software
Develop Software
Help