Index: ch.vc140.sln =================================================================== diff -u -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 -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 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -211,7 +210,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -234,7 +232,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -258,7 +255,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -277,7 +273,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -297,7 +292,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -319,7 +313,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -342,7 +335,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true Index: ext/googletest/gmock-static-crt.vcxproj =================================================================== diff -u -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 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -211,7 +210,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -234,7 +232,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -258,7 +255,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -277,7 +273,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -297,7 +292,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -319,7 +313,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true @@ -342,7 +335,6 @@ true /Zm150 /Zc:threadSafeInit- %(AdditionalOptions) stdcpp17 - true Fisheye: Tag f981afc8ac2d761719c05ab88ebb32d7ca2db54a refers to a dead (removed) revision in file `ext/googletest/gmock.vc140.vcxproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f981afc8ac2d761719c05ab88ebb32d7ca2db54a refers to a dead (removed) revision in file `ext/googletest/gmock.vc140.vcxproj.filters'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f981afc8ac2d761719c05ab88ebb32d7ca2db54a refers to a dead (removed) revision in file `ext/googletest/gmock.sln'. Fisheye: No comparison available. Pass `N' to diff? Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -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 @@ 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 -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 @@ 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 -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 @@ 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 -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 @@ 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 -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -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 -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 @@ 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 -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 @@ 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 -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -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 -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -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 -r3e3b831ac2e28970a76f004f632c451304050c83 -rf981afc8ac2d761719c05ab88ebb32d7ca2db54a --- src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 3e3b831ac2e28970a76f004f632c451304050c83) +++ src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision f981afc8ac2d761719c05ab88ebb32d7ca2db54a) @@ -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