cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
setlocal
-call "%VS120COMNTOOLS%vsvars32.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause
endlocal
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings">\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings" />\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>MultiByte</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings" />\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</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
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<UseOfMfc>Static</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings">\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120_xp</PlatformToolset>\r
+ <PlatformToolset>v141_xp</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
<ConfigurationType>DynamicLibrary</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings">\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
<CharacterSet>Unicode</CharacterSet>\r
- <PlatformToolset>v120</PlatformToolset>\r
+ <PlatformToolset>v141</PlatformToolset>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings">\r
Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 2013\r
-VisualStudioVersion = 12.0.40629.0\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26228.4\r
MinimumVisualStudioVersion = 10.0.40219.1\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"\r
ProjectSection(ProjectDependencies) = postProject\r