Index: ch.vc140.sln =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 --- ch.vc140.sln (.../ch.vc140.sln) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ ch.vc140.sln (.../ch.vc140.sln) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -1,10 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30324.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 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 {D98F2D98-2352-4303-93EE-A5430C4E98AB} = {D98F2D98-2352-4303-93EE-A5430C4E98AB} + {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69} = {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chext", "src\chext\chext.vc140.vcxproj", "{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}" Index: ext/gmock/gmock.vc140.vcxproj =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 --- ext/gmock/gmock.vc140.vcxproj (.../gmock.vc140.vcxproj) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ ext/gmock/gmock.vc140.vcxproj (.../gmock.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -91,27 +91,35 @@ + + + + + + + + @@ -121,61 +129,45 @@ $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)32d - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)32d - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ AllRules.ruleset false $(ProjectName)64d - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ AllRules.ruleset false $(ProjectName)64d - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)32 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)32 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -95,27 +95,35 @@ + + + + + + + + @@ -125,15 +133,11 @@ $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -142,8 +146,6 @@ $(ProjectName)64 false NativeRecommendedRules.ruleset - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -152,38 +154,28 @@ $(ProjectName)64 false NativeRecommendedRules.ruleset - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) Index: src/chext/chext.vc140.vcxproj =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 --- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -99,27 +99,35 @@ + + + + + + + + @@ -130,16 +138,12 @@ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true true - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true true - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -149,8 +153,6 @@ NativeRecommendedRules.ruleset false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -160,42 +162,32 @@ NativeRecommendedRules.ruleset false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true false $(ProjectName)64 - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) Index: src/common/Boost.props =================================================================== diff -u -N --- src/common/Boost.props (revision 0) +++ src/common/Boost.props (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -0,0 +1,17 @@ + + + + + D:\dev\boost_1_59_0\ + + + $(BoostDir);$(IncludePath) + $(BoostDir)lib-$(MSBuildToolsVersion)\x$(PlatformArchitecture)\lib\;$(LibraryPath) + + + + + $(BoostDir) + + + \ No newline at end of file Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -r3e101bacf01b8bc7a0b5f52e98ce8227582558a2 --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 3e101bacf01b8bc7a0b5f52e98ce8227582558a2) @@ -91,27 +91,35 @@ + + + + + + + + @@ -122,16 +130,12 @@ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true $(ProjectName)32ud - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ true $(ProjectName)32ud - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -140,8 +144,6 @@ $(ProjectName)64ud NativeRecommendedRules.ruleset false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ @@ -150,40 +152,30 @@ $(ProjectName)64ud NativeRecommendedRules.ruleset false - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)32u - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)32u - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x32\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)64u - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)intermediate\$(PlatformToolset)\$(Platform)\$(ProjectName)_$(Configuration)\ false $(ProjectName)64u - C:\dev\boost_1_58_0;$(IncludePath) - C:\dev\boost_1_58_0\lib-$(VisualStudioVersion)\x64\lib;$(LibraryPath)