Index: ch.vc140.sln =================================================================== diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- ch.vc140.sln (.../ch.vc140.sln) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ ch.vc140.sln (.../ch.vc140.sln) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.489 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch", "src\ch\ch.vc140.vcxproj", "{4B215B9A-58CA-4987-AC95-7DFC3043E100}" ProjectSection(ProjectDependencies) = postProject @@ -30,8 +30,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "ext\sqlite3\sqlite3.vc140.vcxproj", "{D41831F5-B2A5-4C92-9F15-1D9AB04722CC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "ext\googletest\gmock.vc140.vcxproj", "{D98F2D98-2352-4303-93EE-A5430C4E98AB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblogger", "src\liblogger\liblogger.vc140.vcxproj", "{DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ext", "ext", "{0E7F04BC-F111-4174-A665-F58CDF142934}" @@ -44,6 +42,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libserializer", "src\libserializer\libserializer.vcxproj", "{9490EC08-9CAB-4F99-99D8-0297E5BF6EA7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock-dynamic-crt", "ext\googletest\gmock-dynamic-crt.vcxproj", "{F20DCBBB-9681-467D-B3DB-F006C4D7AB62}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock-static-crt", "ext\googletest\gmock-static-crt.vcxproj", "{D98F2D98-2352-4303-93EE-A5430C4E98AB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -152,22 +154,6 @@ {D41831F5-B2A5-4C92-9F15-1D9AB04722CC}.Testing Release|Win32.Build.0 = Testing Release|Win32 {D41831F5-B2A5-4C92-9F15-1D9AB04722CC}.Testing Release|x64.ActiveCfg = Testing Release|x64 {D41831F5-B2A5-4C92-9F15-1D9AB04722CC}.Testing Release|x64.Build.0 = Testing Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.Build.0 = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|x64.ActiveCfg = Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|x64.Build.0 = Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.ActiveCfg = Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.Build.0 = Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|x64.ActiveCfg = Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|x64.Build.0 = Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.Build.0 = Testing Debug|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.Build.0 = Testing Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.ActiveCfg = Testing Release|x64 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.Build.0 = Testing Release|x64 {DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D}.Debug|Win32.ActiveCfg = Debug|Win32 {DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D}.Debug|Win32.Build.0 = Debug|Win32 {DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D}.Debug|x64.ActiveCfg = Debug|x64 @@ -248,14 +234,50 @@ {9490EC08-9CAB-4F99-99D8-0297E5BF6EA7}.Testing Release|Win32.Build.0 = Testing Release|Win32 {9490EC08-9CAB-4F99-99D8-0297E5BF6EA7}.Testing Release|x64.ActiveCfg = Testing Release|x64 {9490EC08-9CAB-4F99-99D8-0297E5BF6EA7}.Testing Release|x64.Build.0 = Testing Release|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Debug|Win32.ActiveCfg = Debug|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Debug|Win32.Build.0 = Debug|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Debug|x64.ActiveCfg = Debug|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Debug|x64.Build.0 = Debug|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Release|Win32.ActiveCfg = Release|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Release|Win32.Build.0 = Release|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Release|x64.ActiveCfg = Release|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Release|x64.Build.0 = Release|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}.Testing Release|x64.Build.0 = Testing Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.ActiveCfg = Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.Build.0 = Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|x64.ActiveCfg = Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|x64.Build.0 = Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.ActiveCfg = Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.Build.0 = Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|x64.ActiveCfg = Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|x64.Build.0 = Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|Win32.Build.0 = Testing Debug|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.ActiveCfg = Testing Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Debug|x64.Build.0 = Testing Debug|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.ActiveCfg = Testing Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|Win32.Build.0 = Testing Release|Win32 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.ActiveCfg = Testing Release|x64 + {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Testing Release|x64.Build.0 = Testing Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {D41831F5-B2A5-4C92-9F15-1D9AB04722CC} = {0E7F04BC-F111-4174-A665-F58CDF142934} + {F20DCBBB-9681-467D-B3DB-F006C4D7AB62} = {0E7F04BC-F111-4174-A665-F58CDF142934} {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {0E7F04BC-F111-4174-A665-F58CDF142934} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {98C4CBE1-09D1-4405-AB3C-9DD986D66946} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection Index: ext/googletest/gmock-dynamic-crt.vcxproj =================================================================== diff -u -N -rc2ddd0cd88c5aa33b8a344ec21a6dbae16498647 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision c2ddd0cd88c5aa33b8a344ec21a6dbae16498647) +++ ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -191,7 +191,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -211,7 +210,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -234,7 +232,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -258,7 +255,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -277,7 +273,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -297,7 +292,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -319,7 +313,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -342,7 +335,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> Index: ext/googletest/gmock-static-crt.vcxproj =================================================================== diff -u -N -rc2ddd0cd88c5aa33b8a344ec21a6dbae16498647 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision c2ddd0cd88c5aa33b8a344ec21a6dbae16498647) +++ ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -191,7 +191,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -211,7 +210,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -234,7 +232,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -258,7 +255,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -277,7 +273,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -297,7 +292,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -319,7 +313,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> @@ -342,7 +335,6 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> <LanguageStandard>stdcpp17</LanguageStandard> - <EnforceTypeConversionRules>true</EnforceTypeConversionRules> </ClCompile> <Lib /> </ItemDefinitionGroup> Index: ext/googletest/gmock.vc140.vcxproj =================================================================== diff -u -N --- ext/googletest/gmock.vc140.vcxproj (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ ext/googletest/gmock.vc140.vcxproj (revision 0) @@ -1,344 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Testing Debug|Win32"> - <Configuration>Testing Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Testing Debug|x64"> - <Configuration>Testing Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Testing Release|Win32"> - <Configuration>Testing Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Testing Release|x64"> - <Configuration>Testing Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClCompile Include="googlemock\src\gmock-all.cc" /> - <ClCompile Include="googletest\src\gtest-all.cc" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{D98F2D98-2352-4303-93EE-A5430C4E98AB}</ProjectGuid> - <RootNamespace>gmock</RootNamespace> - <Keyword>Win32Proj</Keyword> - <ProjectName>gmock</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v141_xp</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\src\common\Boost.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)32d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)32d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <RunCodeAnalysis>false</RunCodeAnalysis> - <TargetName>$(ProjectName)64d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <RunCodeAnalysis>false</RunCodeAnalysis> - <TargetName>$(ProjectName)64d</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)32</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)32</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)64</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'"> - <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir> - <TargetName>$(ProjectName)64</TargetName> - </PropertyGroup> - <PropertyGroup> - <XPDeprecationWarning>false</XPDeprecationWarning> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>false</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader /> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>false</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>false</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader /> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <EnablePREfast>false</EnablePREfast> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>false</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <EnablePREfast>false</EnablePREfast> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader /> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader /> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zm150 /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - <LanguageStandard>stdcpp17</LanguageStandard> - </ClCompile> - <Lib /> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file Index: ext/googletest/gmock.vc140.vcxproj.filters =================================================================== diff -u -N --- ext/googletest/gmock.vc140.vcxproj.filters (revision 4a481bbe77043e0bda2435c6d62a02700b3e46c5) +++ ext/googletest/gmock.vc140.vcxproj.filters (revision 0) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="googlemock\src\gmock-all.cc"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="googletest\src\gtest-all.cc"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project> \ No newline at end of file Index: ext/googletest/gmock.sln =================================================================== diff -u -N --- ext/googletest/gmock.sln (revision 4a481bbe77043e0bda2435c6d62a02700b3e46c5) +++ ext/googletest/gmock.sln (revision 0) @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcproj", "{D98F2D98-2352-4303-93EE-A5430C4E98AB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Debug|Win32.Build.0 = Debug|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.ActiveCfg = Release|Win32 - {D98F2D98-2352-4303-93EE-A5430C4E98AB}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -N -r5c266be2a01d402f56cb020cfcb0df2d030b42ef -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 5c266be2a01d402f56cb020cfcb0df2d030b42ef) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -250,7 +250,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX86</TargetMachine> @@ -335,7 +335,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine> @@ -419,7 +419,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX86</TargetMachine> @@ -503,7 +503,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine> Index: src/chext/chext.vc140.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -254,7 +254,7 @@ </ResourceCompile> <Link> <RegisterOutput>false</RegisterOutput> - <AdditionalDependencies>comctl32.lib;gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>comctl32.lib;gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>chext.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> @@ -344,7 +344,7 @@ </ResourceCompile> <Link> <RegisterOutput>false</RegisterOutput> - <AdditionalDependencies>comctl32.lib;gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>comctl32.lib;gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>chext.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> @@ -432,7 +432,7 @@ </ResourceCompile> <Link> <RegisterOutput>false</RegisterOutput> - <AdditionalDependencies>comctl32.lib;gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>comctl32.lib;gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>chext.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> @@ -522,7 +522,7 @@ </ResourceCompile> <Link> <RegisterOutput>false</RegisterOutput> - <AdditionalDependencies>comctl32.lib;gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>comctl32.lib;gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>chext.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> Index: src/ictranslate/ictranslate.vc140.vcxproj =================================================================== diff -u -N -r5c266be2a01d402f56cb020cfcb0df2d030b42ef -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision 5c266be2a01d402f56cb020cfcb0df2d030b42ef) +++ src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -244,7 +244,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt32d.lib</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -317,7 +317,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt64d.lib</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -396,7 +396,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt32.lib</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -475,7 +475,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt64.lib</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -235,7 +235,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -310,7 +310,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -381,7 +381,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -458,7 +458,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/libchengine/libchengine.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -235,7 +235,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -310,7 +310,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -381,7 +381,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -458,7 +458,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/libictranslate/libictranslate.vc140.vcxproj =================================================================== diff -u -N -r5c266be2a01d402f56cb020cfcb0df2d030b42ef -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision 5c266be2a01d402f56cb020cfcb0df2d030b42ef) +++ src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -247,7 +247,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt32d.lib</AdditionalDependencies> </Link> <PostBuildEvent> <Command>cd "$(TargetDir)" @@ -331,7 +331,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt64d.lib</AdditionalDependencies> </Link> <PostBuildEvent> <Command>cd "$(TargetDir)" @@ -417,7 +417,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt32.lib</AdditionalDependencies> </Link> <PostBuildEvent> <Command>cd "$(TargetDir)" @@ -505,7 +505,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib</AdditionalDependencies> + <AdditionalDependencies>gmock-dynamic-crt64.lib</AdditionalDependencies> </Link> <PostBuildEvent> <Command>cd "$(TargetDir)" Index: src/liblogger/liblogger.vc140.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -227,7 +227,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -302,7 +302,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -373,7 +373,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -450,7 +450,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/libserializer/libserializer.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -235,7 +235,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -310,7 +310,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -381,7 +381,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -458,7 +458,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/libstring/libstring.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -235,7 +235,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -310,7 +310,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -381,7 +381,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> @@ -458,7 +458,7 @@ <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> <TargetMachine>MachineX64</TargetMachine> - <AdditionalDependencies>gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories> </Link> <PostBuildEvent> Index: src/regchext/regchext.vcxproj =================================================================== diff -u -N -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -251,7 +251,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>Shlwapi.lib;gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>Shlwapi.lib;gmock-static-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX86</TargetMachine> @@ -337,7 +337,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>Shlwapi.lib;gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>Shlwapi.lib;gmock-static-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine> @@ -422,7 +422,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>Shlwapi.lib;gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>Shlwapi.lib;gmock-static-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX86</TargetMachine> @@ -507,7 +507,7 @@ <Culture>0x0409</Culture> </ResourceCompile> <Link> - <AdditionalDependencies>Shlwapi.lib;gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>Shlwapi.lib;gmock-static-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine>