Index: ch.vc140.sln
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- ch.vc140.sln (.../ch.vc140.sln) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ ch.vc140.sln (.../ch.vc140.sln) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -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
--- ext/googletest/gmock-dynamic-crt.vcxproj (revision 0)
+++ ext/googletest/gmock-dynamic-crt.vcxproj (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -0,0 +1,344 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+ Testing Debug
+ Win32
+
+
+ Testing Debug
+ x64
+
+
+ Testing Release
+ Win32
+
+
+ Testing Release
+ x64
+
+
+
+
+
+
+
+ {F20DCBBB-9681-467D-B3DB-F006C4D7AB62}
+ gmock-dynamic-crt
+ Win32Proj
+ gmock-dynamic-crt
+ 8.1
+
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>11.0.51106.1
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ AllRules.ruleset
+ false
+ $(ProjectName)64d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ AllRules.ruleset
+ false
+ $(ProjectName)64d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)64
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)64
+
+
+ false
+
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+ Level3
+ ProgramDatabase
+ false
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+ false
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+
+
\ No newline at end of file
Index: ext/googletest/gmock-dynamic-crt.vcxproj.filters
===================================================================
diff -u -N
--- ext/googletest/gmock-dynamic-crt.vcxproj.filters (revision 0)
+++ ext/googletest/gmock-dynamic-crt.vcxproj.filters (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -0,0 +1,17 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
Index: ext/googletest/gmock-static-crt.vcxproj
===================================================================
diff -u -N
--- ext/googletest/gmock-static-crt.vcxproj (revision 0)
+++ ext/googletest/gmock-static-crt.vcxproj (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -0,0 +1,344 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+ Testing Debug
+ Win32
+
+
+ Testing Debug
+ x64
+
+
+ Testing Release
+ Win32
+
+
+ Testing Release
+ x64
+
+
+
+
+
+
+
+ {D98F2D98-2352-4303-93EE-A5430C4E98AB}
+ gmock-static-crt
+ Win32Proj
+ gmock-static-crt
+ 8.1
+
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+ true
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+ StaticLibrary
+ v141_xp
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>11.0.51106.1
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ AllRules.ruleset
+ false
+ $(ProjectName)64d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ AllRules.ruleset
+ false
+ $(ProjectName)64d
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)32
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)64
+
+
+ $(SolutionDir)bin\$(Configuration)\
+ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
+ $(ProjectName)64
+
+
+ false
+
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebug
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebug
+
+ Level3
+ ProgramDatabase
+ false
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ Disabled
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ false
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+ X64
+
+
+ MaxSpeed
+ true
+ googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+
+ Level3
+ ProgramDatabase
+ true
+ true
+ /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
+ stdcpp17
+
+
+
+
+
+
+
\ No newline at end of file
Index: ext/googletest/gmock.vc140.vcxproj
===================================================================
diff -u -N
--- ext/googletest/gmock.vc140.vcxproj (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ ext/googletest/gmock.vc140.vcxproj (revision 0)
@@ -1,344 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
- Testing Debug
- Win32
-
-
- Testing Debug
- x64
-
-
- Testing Release
- Win32
-
-
- Testing Release
- x64
-
-
-
-
-
-
-
- {D98F2D98-2352-4303-93EE-A5430C4E98AB}
- gmock
- Win32Proj
- gmock
- 8.1
-
-
-
- StaticLibrary
- v141_xp
- Unicode
- true
-
-
- StaticLibrary
- v141_xp
- Unicode
- true
-
-
- StaticLibrary
- v141_xp
- Unicode
-
-
- StaticLibrary
- v141_xp
- Unicode
-
-
- StaticLibrary
- v141_xp
- Unicode
- true
-
-
- StaticLibrary
- v141_xp
- Unicode
- true
-
-
- StaticLibrary
- v141_xp
- Unicode
-
-
- StaticLibrary
- v141_xp
- Unicode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>11.0.51106.1
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)32d
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)32d
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- AllRules.ruleset
- false
- $(ProjectName)64d
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- AllRules.ruleset
- false
- $(ProjectName)64d
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)32
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)32
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)64
-
-
- $(SolutionDir)bin\$(Configuration)\
- $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\
- $(ProjectName)64
-
-
- false
-
-
-
- Disabled
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- false
- EnableFastChecks
- MultiThreadedDebug
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- Disabled
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- false
- EnableFastChecks
- MultiThreadedDebug
-
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- X64
-
-
- Disabled
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- false
- EnableFastChecks
- MultiThreadedDebug
-
- Level3
- ProgramDatabase
- false
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- X64
-
-
- Disabled
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- false
- EnableFastChecks
- MultiThreadedDebug
-
-
- Level3
- ProgramDatabase
- false
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- MaxSpeed
- true
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- MultiThreaded
- true
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- MaxSpeed
- true
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- MultiThreaded
- true
-
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- X64
-
-
- MaxSpeed
- true
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- MultiThreaded
- true
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
- X64
-
-
- MaxSpeed
- true
- googletest/include;googletest;googlemock/include;googlemock;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_VARIADIC_MAX=10;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)
- MultiThreaded
- true
-
-
- Level3
- ProgramDatabase
- true
- true
- /Zm150 /Zc:threadSafeInit- %(AdditionalOptions)
- stdcpp17
-
-
-
-
-
-
-
\ No newline at end of file
Index: ext/googletest/gmock-static-crt.vcxproj.filters
===================================================================
diff -u -N
--- ext/googletest/gmock-static-crt.vcxproj.filters (revision 0)
+++ ext/googletest/gmock-static-crt.vcxproj.filters (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -0,0 +1,17 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ 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 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
-
-
- Source Files
-
-
- Source Files
-
-
-
\ 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 -r233a7735eac15aad91181d9c173573a53e9ae122 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 233a7735eac15aad91181d9c173573a53e9ae122)
+++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -250,7 +250,7 @@
0x0409
- winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32d.lib;%(AdditionalDependencies)
+ winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32d.lib;%(AdditionalDependencies)
true
Console
MachineX86
@@ -335,7 +335,7 @@
0x0409
- winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64d.lib;%(AdditionalDependencies)
+ winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64d.lib;%(AdditionalDependencies)
true
Console
MachineX64
@@ -419,7 +419,7 @@
0x0409
- winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32.lib;%(AdditionalDependencies)
+ winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt32.lib;%(AdditionalDependencies)
true
Console
MachineX86
@@ -503,7 +503,7 @@
0x0409
- winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64.lib;%(AdditionalDependencies)
+ winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock-dynamic-crt64.lib;%(AdditionalDependencies)
true
Console
MachineX64
Index: src/chext/chext.vc140.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -254,7 +254,7 @@
false
- comctl32.lib;gmock32d.lib;%(AdditionalDependencies)
+ comctl32.lib;gmock-static-crt32d.lib;%(AdditionalDependencies)
chext.def
true
Windows
@@ -344,7 +344,7 @@
false
- comctl32.lib;gmock64d.lib;%(AdditionalDependencies)
+ comctl32.lib;gmock-static-crt64d.lib;%(AdditionalDependencies)
chext.def
true
Windows
@@ -432,7 +432,7 @@
false
- comctl32.lib;gmock32.lib;%(AdditionalDependencies)
+ comctl32.lib;gmock-static-crt32.lib;%(AdditionalDependencies)
chext.def
true
Windows
@@ -522,7 +522,7 @@
false
- comctl32.lib;gmock64.lib;%(AdditionalDependencies)
+ comctl32.lib;gmock-static-crt64.lib;%(AdditionalDependencies)
chext.def
true
Windows
Index: src/ictranslate/ictranslate.vc140.vcxproj
===================================================================
diff -u -N -r233a7735eac15aad91181d9c173573a53e9ae122 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision 233a7735eac15aad91181d9c173573a53e9ae122)
+++ src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -244,7 +244,7 @@
true
Console
MachineX86
- gmock32d.lib
+ gmock-dynamic-crt32d.lib
"$(OutDir)"
@@ -317,7 +317,7 @@
true
Console
MachineX64
- gmock64d.lib
+ gmock-dynamic-crt64d.lib
"$(OutDir)"
@@ -396,7 +396,7 @@
true
true
MachineX86
- gmock32.lib
+ gmock-dynamic-crt32.lib
"$(OutDir)"
@@ -475,7 +475,7 @@
true
true
MachineX64
- gmock64.lib
+ gmock-dynamic-crt64.lib
"$(OutDir)"
Index: src/libchcore/libchcore.vc140.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -235,7 +235,7 @@
true
Windows
MachineX86
- gmock32d.lib;%(AdditionalDependencies)
+ gmock-static-crt32d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -310,7 +310,7 @@
true
Windows
MachineX64
- gmock64d.lib;%(AdditionalDependencies)
+ gmock-static-crt64d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -381,7 +381,7 @@
true
true
MachineX86
- gmock32.lib;%(AdditionalDependencies)
+ gmock-static-crt32.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -458,7 +458,7 @@
true
true
MachineX64
- gmock64.lib;%(AdditionalDependencies)
+ gmock-static-crt64.lib;%(AdditionalDependencies)
"$(OutDir)"
Index: src/libchengine/libchengine.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -235,7 +235,7 @@
true
Windows
MachineX86
- gmock32d.lib;%(AdditionalDependencies)
+ gmock-static-crt32d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -310,7 +310,7 @@
true
Windows
MachineX64
- gmock64d.lib;%(AdditionalDependencies)
+ gmock-static-crt64d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -381,7 +381,7 @@
true
true
MachineX86
- gmock32.lib;%(AdditionalDependencies)
+ gmock-static-crt32.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -458,7 +458,7 @@
true
true
MachineX64
- gmock64.lib;%(AdditionalDependencies)
+ gmock-static-crt64.lib;%(AdditionalDependencies)
"$(OutDir)"
Index: src/libictranslate/libictranslate.vc140.vcxproj
===================================================================
diff -u -N -r233a7735eac15aad91181d9c173573a53e9ae122 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision 233a7735eac15aad91181d9c173573a53e9ae122)
+++ src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -247,7 +247,7 @@
true
Windows
MachineX86
- gmock32d.lib
+ gmock-dynamic-crt32d.lib
cd "$(TargetDir)"
@@ -331,7 +331,7 @@
true
Windows
MachineX64
- gmock64d.lib
+ gmock-dynamic-crt64d.lib
cd "$(TargetDir)"
@@ -417,7 +417,7 @@
true
true
MachineX86
- gmock32.lib
+ gmock-dynamic-crt32.lib
cd "$(TargetDir)"
@@ -505,7 +505,7 @@
true
true
MachineX64
- gmock64.lib
+ gmock-dynamic-crt64.lib
cd "$(TargetDir)"
Index: src/liblogger/liblogger.vc140.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -227,7 +227,7 @@
true
Windows
MachineX86
- gmock32d.lib;%(AdditionalDependencies)
+ gmock-static-crt32d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -302,7 +302,7 @@
true
Windows
MachineX64
- gmock64d.lib;%(AdditionalDependencies)
+ gmock-static-crt64d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -373,7 +373,7 @@
true
true
MachineX86
- gmock32.lib;%(AdditionalDependencies)
+ gmock-static-crt32.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -450,7 +450,7 @@
true
true
MachineX64
- gmock64.lib;%(AdditionalDependencies)
+ gmock-static-crt64.lib;%(AdditionalDependencies)
"$(OutDir)"
Index: src/libserializer/libserializer.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -235,7 +235,7 @@
true
Windows
MachineX86
- gmock32d.lib;%(AdditionalDependencies)
+ gmock-static-crt32d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -310,7 +310,7 @@
true
Windows
MachineX64
- gmock64d.lib;%(AdditionalDependencies)
+ gmock-static-crt64d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -381,7 +381,7 @@
true
true
MachineX86
- gmock32.lib;%(AdditionalDependencies)
+ gmock-static-crt32.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -458,7 +458,7 @@
true
true
MachineX64
- gmock64.lib;%(AdditionalDependencies)
+ gmock-static-crt64.lib;%(AdditionalDependencies)
"$(OutDir)"
Index: src/libstring/libstring.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -235,7 +235,7 @@
true
Windows
MachineX86
- gmock32d.lib;%(AdditionalDependencies)
+ gmock-static-crt32d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -310,7 +310,7 @@
true
Windows
MachineX64
- gmock64d.lib;%(AdditionalDependencies)
+ gmock-static-crt64d.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -381,7 +381,7 @@
true
true
MachineX86
- gmock32.lib;%(AdditionalDependencies)
+ gmock-static-crt32.lib;%(AdditionalDependencies)
"$(OutDir)"
@@ -458,7 +458,7 @@
true
true
MachineX64
- gmock64.lib;%(AdditionalDependencies)
+ gmock-static-crt64.lib;%(AdditionalDependencies)
"$(OutDir)"
Index: src/regchext/regchext.vcxproj
===================================================================
diff -u -N -r6b9660f83b70b41679c8cc1f7696b8c16b133b67 -rf9a0580b36061d769a3c997893da2c925c8692b1
--- src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 6b9660f83b70b41679c8cc1f7696b8c16b133b67)
+++ src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision f9a0580b36061d769a3c997893da2c925c8692b1)
@@ -251,7 +251,7 @@
0x0409
- Shlwapi.lib;gmock32d.lib;%(AdditionalDependencies)
+ Shlwapi.lib;gmock-static-crt32d.lib;%(AdditionalDependencies)
true
Console
MachineX86
@@ -337,7 +337,7 @@
0x0409
- Shlwapi.lib;gmock64d.lib;%(AdditionalDependencies)
+ Shlwapi.lib;gmock-static-crt64d.lib;%(AdditionalDependencies)
true
Console
MachineX64
@@ -422,7 +422,7 @@
0x0409
- Shlwapi.lib;gmock32.lib;%(AdditionalDependencies)
+ Shlwapi.lib;gmock-static-crt32.lib;%(AdditionalDependencies)
true
Console
MachineX86
@@ -507,7 +507,7 @@
0x0409
- Shlwapi.lib;gmock64.lib;%(AdditionalDependencies)
+ Shlwapi.lib;gmock-static-crt64.lib;%(AdditionalDependencies)
true
Console
MachineX64