<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
- <ProjectConfiguration Include="UnicodeDebug|Win32">\r
- <Configuration>UnicodeDebug</Configuration>\r
+ <ProjectConfiguration Include="Test|Win32">\r
+ <Configuration>Test</Configuration>\r
<Platform>Win32</Platform>\r
</ProjectConfiguration>\r
- <ProjectConfiguration Include="UnicodeDebug|x64">\r
- <Configuration>UnicodeDebug</Configuration>\r
+ <ProjectConfiguration Include="Test|x64">\r
+ <Configuration>Test</Configuration>\r
<Platform>x64</Platform>\r
</ProjectConfiguration>\r
- <ProjectConfiguration Include="UnicodeRelease|Win32">\r
- <Configuration>UnicodeRelease</Configuration>\r
+ <ProjectConfiguration Include="Debug|Win32">\r
+ <Configuration>Debug</Configuration>\r
<Platform>Win32</Platform>\r
</ProjectConfiguration>\r
- <ProjectConfiguration Include="UnicodeRelease|x64">\r
- <Configuration>UnicodeRelease</Configuration>\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
<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)'=='UnicodeDebug|Win32'" Label="Configuration">\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
- <PlatformToolset>v140</PlatformToolset>\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)'=='UnicodeRelease|Win32'" Label="Configuration">\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v140_xp</PlatformToolset>\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)'=='UnicodeDebug|x64'" Label="Configuration">\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v140</PlatformToolset>\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)'=='UnicodeRelease|x64'" Label="Configuration">\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v140_xp</PlatformToolset>\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 Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
+ <ImportGroup Label="Shared">\r
+ <Import Project="..\Externals\crystaledit\editlib\editlib.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
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
</ImportGroup>\r
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\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
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
</ImportGroup>\r
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\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
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
</ImportGroup>\r
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\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)'=='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)'=='Release|x64'" Label="PropertySheets">\r
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
</ImportGroup>\r
<PropertyGroup Label="UserMacros" />\r
<PropertyGroup>\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>\r
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>\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
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">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)'=='Test|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>\r
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
+ <TargetName>Win$(ProjectName)U</TargetName>\r
</PropertyGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
<Midl>\r
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MkTypLibCompatible>true</MkTypLibCompatible>\r
</HeaderFileName>\r
</Midl>\r
<ClCompile>\r
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\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>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\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>Level3</WarningLevel>\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
<Link>\r
<AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
<SuppressStartupBanner>true</SuppressStartupBanner>\r
- <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
</DataExecutionPrevention>\r
<TargetMachine>MachineX86</TargetMachine>\r
<GenerateMapFile>true</GenerateMapFile>\r
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+ <OptimizeReferences>true</OptimizeReferences>\r
+ <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
</Link>\r
- <PostBuildEvent>\r
- <Command>\r
- </Command>\r
- </PostBuildEvent>\r
</ItemDefinitionGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">\r
- <CustomBuildStep>\r
- <Command>\r
- </Command>\r
- <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
- </CustomBuildStep>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
<Midl>\r
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MkTypLibCompatible>true</MkTypLibCompatible>\r
</HeaderFileName>\r
</Midl>\r
<ClCompile>\r
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\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>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\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>Level3</WarningLevel>\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
<Link>\r
<AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
<SuppressStartupBanner>true</SuppressStartupBanner>\r
- <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\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
- <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
- <DataExecutionPrevention>\r
- </DataExecutionPrevention>\r
<TargetMachine>MachineX64</TargetMachine>\r
<GenerateMapFile>true</GenerateMapFile>\r
- <OptimizeReferences>\r
- </OptimizeReferences>\r
+ <OptimizeReferences>true</OptimizeReferences>\r
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</Link>\r
- <PostBuildEvent>\r
- <Command>\r
- </Command>\r
- </PostBuildEvent>\r
</ItemDefinitionGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<Midl>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MkTypLibCompatible>true</MkTypLibCompatible>\r
</HeaderFileName>\r
</Midl>\r
<ClCompile>\r
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\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>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\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>true</BrowseInformation>\r
- <WarningLevel>Level3</WarningLevel>\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
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
<SuppressStartupBanner>true</SuppressStartupBanner>\r
- <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\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\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>\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
- <PostBuildEvent>\r
- <Command>\r
- </Command>\r
- </PostBuildEvent>\r
</ItemDefinitionGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
- <CustomBuildStep>\r
- <Command>\r
- </Command>\r
- <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
- </CustomBuildStep>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
<Midl>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MkTypLibCompatible>true</MkTypLibCompatible>\r
</HeaderFileName>\r
</Midl>\r
<ClCompile>\r
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\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>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\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>true</BrowseInformation>\r
- <WarningLevel>Level3</WarningLevel>\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
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
<SuppressStartupBanner>true</SuppressStartupBanner>\r
- <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
- <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
- <DataExecutionPrevention>\r
- </DataExecutionPrevention>\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|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\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>\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
- <PostBuildEvent>\r
- <Command>\r
- </Command>\r
- </PostBuildEvent>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
- <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+ <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+ <ExcludedFromBuild>true</ExcludedFromBuild>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xdiffi.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xemit.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xhistogram.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xmerge.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xpatience.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xprepare.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\xdiff\xutils.c">\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
</ClCompile>\r
- <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
- <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />\r
<ClCompile Include="7zCommon.cpp">\r
</ClCompile>\r
<ClCompile Include="AboutDlg.cpp">\r
</ClCompile>\r
+ <ClCompile Include="CompareEngines\ImageCompare.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="CCPromptDlg.cpp">\r
- </ClCompile>\r
<ClCompile Include="charsets.c">\r
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>\r
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>\r
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>\r
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>\r
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>\r
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>\r
- </ClCompile>\r
- <ClCompile Include="ChildFrm.cpp" />\r
+ </ClCompile>\r
+ <ClCompile Include="DirSelectFilesDlg.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>NotUsing</PrecompiledHeader>\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.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
<ClCompile Include="codepage_detect.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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="OptionsDef.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="OptionsCustomColors.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
- <ClCompile Include="DirCmpReport.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
- <ClCompile Include="Common\dllproxy.c">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
- <ClCompile Include="dllpstub.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
- <ClCompile Include="FilterCommentsManager.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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="HexMergeView.cpp" />\r
<ClCompile Include="Common\LanguageSelect.cpp" />\r
<ClCompile Include="JumpList.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>\r
<ClCompile Include="MainFrm.cpp" />\r
<ClCompile Include="markdown.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
+ <ClCompile Include="MergeApp.cpp" />\r
<ClCompile Include="MergeCmdLineInfo.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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="MergeEditView.cpp" />\r
<ClCompile Include="Common\MessageBoxDialog.cpp" />\r
<ClCompile Include="MovedBlocks.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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="OptionsPanel.cpp" />\r
<ClCompile Include="OptionsSyntaxColors.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
- <ClCompile Include="Common\Picture.cpp" />\r
<ClCompile Include="Common\PidlContainer.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
- <ClCompile Include="ProjectFilePathsDlg.cpp" />\r
<ClCompile Include="PropArchive.cpp" />\r
<ClCompile Include="PropBackups.cpp" />\r
<ClCompile Include="PropCodepage.cpp" />\r
- <ClCompile Include="PropColors.cpp" />\r
+ <ClCompile Include="PropColorSchemes.cpp" />\r
+ <ClCompile Include="PropCompareTable.cpp" />\r
+ <ClCompile Include="PropEditorSyntax.cpp" />\r
+ <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="PropRegistry.cpp" />\r
<ClCompile Include="PropShell.cpp" />\r
<ClCompile Include="PropSyntaxColors.cpp" />\r
<ClCompile Include="PropTextColors.cpp" />\r
- <ClCompile Include="PropVss.cpp" />\r
<ClCompile Include="Common\RegKey.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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="SelectUnpackerDlg.cpp" />\r
<ClCompile Include="SharedFilterDlg.cpp" />\r
- <ClCompile Include="Common\ShellContextMenu.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>NotUsing</PrecompiledHeader>\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="SourceControl.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
<ClCompile Include="Common\SplitterWndEx.cpp" />\r
<ClCompile Include="StdAfx.cpp">\r
<PrecompiledHeader>Create</PrecompiledHeader>\r
</ClCompile>\r
<ClCompile Include="stringdiffs.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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>NotUsing</PrecompiledHeader>\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="UniMarkdownFile.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="Common\varprop.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
- </ClCompile>\r
- <ClCompile Include="Common\version.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
- <ClCompile Include="VSSHelper.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\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="VssPromptDlg.cpp" />\r
+ <ClCompile Include="WildcardDropList.cpp" />\r
+ <ClCompile Include="WindowsManagerDialog.cpp" />\r
<ClCompile Include="WMGotoDlg.cpp" />\r
<ClCompile Include="diffutils\src\analyze.c">\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
</ClCompile>\r
<ClCompile Include="diffutils\src\Diff.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="diffutils\src\ed.c">\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
<ClCompile Include="diffutils\src\util.c">\r
<PrecompiledHeader>NotUsing</PrecompiledHeader>\r
</ClCompile>\r
+ <ClCompile Include="diffutils\src\mystat.cpp">\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+ </ClCompile>\r
<ClCompile Include="CompareEngines\ByteComparator.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="CompareEngines\ByteCompare.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
- <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
<ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
- <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+ </ClCompile>\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\crystaledit\editlib\ccrystaleditview.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
- <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\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="..\Externals\xdiff\xdiff.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xdiffi.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xemit.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xinclude.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xmacros.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xprepare.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xtypes.h" />\r
+ <ClInclude Include="..\Externals\xdiff\xutils.h" />\r
+ <ClInclude Include="..\Version.h" />\r
<ClInclude Include="7zCommon.h" />\r
<ClInclude Include="AboutDlg.h" />\r
+ <ClInclude Include="CompareEngines\ImageCompare.h" />\r
+ <ClInclude Include="Concurrent.h" />\r
<ClInclude Include="Common\BCMenu.h" />\r
<ClInclude Include="Common\Bitmap.h" />\r
- <ClInclude Include="CCPromptDlg.h" />\r
<ClInclude Include="charsets.h" />\r
- <ClInclude Include="ChildFrm.h" />\r
+ <ClInclude Include="DirSelectFilesDlg.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.h" />\r
<ClInclude Include="codepage_detect.h" />\r
<ClInclude Include="Common\ColorButton.h" />\r
<ClInclude Include="Common\ExConverter.h" />\r
<ClInclude Include="ConfirmFolderCopyDlg.h" />\r
<ClInclude Include="ConflictFileParser.h" />\r
<ClInclude Include="Common\coretools.h" />\r
- <ClInclude Include="Common\coretypes.h" />\r
<ClInclude Include="Constants.h" />\r
<ClInclude Include="DirActions.h" />\r
<ClInclude Include="HexMergeView.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="DirTravel.h" />\r
<ClInclude Include="DirView.h" />\r
<ClInclude Include="DirViewColItems.h" />\r
- <ClInclude Include="Common\dllproxy.h" />\r
<ClInclude Include="dllpstub.h" />\r
<ClInclude Include="EditorFilepathBar.h" />\r
<ClInclude Include="EncodingErrorBar.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="FileTextStats.h" />\r
<ClInclude Include="FileTransform.h" />\r
<ClInclude Include="FileVersion.h" />\r
- <ClInclude Include="FilterCommentsManager.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="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="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" />\r
<ClInclude Include="OptionsInit.h" />\r
<ClInclude Include="OptionsPanel.h" />\r
<ClInclude Include="PatchTool.h" />\r
<ClInclude Include="PathContext.h" />\r
<ClInclude Include="paths.h" />\r
- <ClInclude Include="Common\Picture.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="ProjectFilePathsDlg.h" />\r
<ClInclude Include="PropArchive.h" />\r
<ClInclude Include="PropBackups.h" />\r
<ClInclude Include="PropCodepage.h" />\r
- <ClInclude Include="PropColors.h" />\r
+ <ClInclude Include="PropColorSchemes.h" />\r
+ <ClInclude Include="PropCompareTable.h" />\r
+ <ClInclude Include="PropEditorSyntax.h" />\r
+ <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="PropRegistry.h" />\r
<ClInclude Include="PropShell.h" />\r
<ClInclude Include="PropSyntaxColors.h" />\r
<ClInclude Include="PropTextColors.h" />\r
- <ClInclude Include="PropVss.h" />\r
<ClInclude Include="Common\RegKey.h" />\r
<ClInclude Include="Common\RegOptionsMgr.h" />\r
<ClInclude Include="Resource.h" />\r
<ClInclude Include="Common\sizecbar.h" />\r
<ClInclude Include="Common\SortHeaderCtrl.h" />\r
<ClInclude Include="Common\SplitterWndEx.h" />\r
- <ClInclude Include="SourceControl.h" />\r
- <ClInclude Include="ssapi.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="TrDialogs.h" />\r
<ClInclude Include="UniMarkdownFile.h" />\r
<ClInclude Include="Common\varprop.h" />\r
- <ClInclude Include="Common\version.h" />\r
- <ClInclude Include="VSSHelper.h" />\r
- <ClInclude Include="VssPromptDlg.h" />\r
+ <ClInclude Include="Common\VersionInfo.h" />\r
+ <ClInclude Include="WildcardDropList.h" />\r
+ <ClInclude Include="WindowsManagerDialog.h" />\r
+ <ClInclude Include="Win_VersionHelper.h" />\r
<ClInclude Include="WMGotoDlg.h" />\r
<ClInclude Include="diffutils\lib\cmpbuf.h" />\r
<ClInclude Include="diffutils\config.h" />\r
<ClInclude Include="diffutils\src\system.h" />\r
<ClInclude Include="CompareEngines\ByteComparator.h" />\r
<ClInclude Include="CompareEngines\ByteCompare.h" />\r
- <ClInclude Include="CompareEngines\DiffUtils.h" />\r
+ <ClInclude Include="CompareEngines\Wrap_DiffUtils.h" />\r
<ClInclude Include="CompareEngines\TimeSizeCompare.h" />\r
+ <ClInclude Include="xdiff_gnudiff_compat.h" />\r
</ItemGroup>\r
<ItemGroup>\r
- <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />\r
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />\r
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />\r
- <None Include="..\Externals\crystaledit\editlib\filesup.inl" />\r
- <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />\r
<None Include="res\binarydiff.ico" />\r
<None Include="res\both.bmp" />\r
<None Include="res\equalbinary.ico" />\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