VS2019 and Boost 1.76

cbucher · Jun 6, 2021 · b6b7566 · b6b7566
1 parent db6b1f1
commit b6b7566
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ l10n/*/resource.h
 l10n/*/*.ucs2.rc
 
 icons/*/
+
+Backup/
diff --git a/Console/BoostIncludePath.props.user.template b/Console/BoostIncludePath.props.user.template
@@ -5,6 +5,6 @@
 	Set the path below to where the boost library is located on your machine, and rename this file to "BoostIncludePath.props.user".
 	NOTE: If the project is currently open in Visual Studio, you must unload the project/solution and re-open it for any changes to take effect.
 	-->
-    <BoostIncludePath>C:\third-party-libraries\boost-1.57.0</BoostIncludePath>
+    <BoostIncludePath>C:\third-party-libraries\boost-1.76.0</BoostIncludePath>
   </PropertyGroup>
 </Project>
diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj
@@ -88,7 +88,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <BoostIncludePath>G:\gitstuff\boost_1_59_0</BoostIncludePath>
+    <BoostIncludePath>C:\gitstuff\boost_1_76_0</BoostIncludePath>
   </PropertyGroup>
   <Import Project="BoostIncludePath.props.user" Condition="exists('BoostIncludePath.props.user')" />
   <PropertyGroup>
@@ -173,7 +173,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -229,7 +228,6 @@ copy "..\setup\dlls\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\"</C
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_USE_AERO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -285,7 +283,6 @@ copy "..\setup\dlls\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\"</C
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -341,7 +338,6 @@ copy "..\setup\dlls\x64\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_USE_AERO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/Console/stdafx.h b/Console/stdafx.h
@@ -31,7 +31,7 @@
 #define _WTL_NO_WTYPES
 
 #pragma warning(push)
-#pragma warning(disable: 4091 4302 4458 4838 4996)
+#pragma warning(disable: 4091)
 #include <atlapp.h>
 
 extern CAppModule _Module;
@@ -112,10 +112,6 @@ an alternative solution is to add an additional library to your linker input, le
 #include <ShellScalingAPI.h>
 #endif
 
-#pragma warning(disable: 4503) // disables 'name truncated' warnings
-
-#pragma warning(push)
-#pragma warning(disable: 4702)
 #include <iostream>
 #include <sstream>
 #include <fstream>
@@ -127,25 +123,18 @@ an alternative solution is to add an additional library to your linker input, le
 #include <regex>
 #include <chrono>
 #include <filesystem>
-#pragma warning(pop)
 
-#pragma warning(push)
-#pragma warning(disable: 4244 4267 4511 4512 701 4702)
 #define BOOST_ALL_NO_LIB
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/format.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/algorithm/string.hpp>
-#pragma warning(pop)
 
-#pragma warning(push)
-#pragma warning(disable: 4510 4610)
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 using namespace boost::multi_index;
-#pragma warning(pop)
 
 #include <WinInet.h>
 #if _WIN32_WINNT >= 0x0600

diff --git a/ConsoleHook/BoostIncludePath.props.user.template b/ConsoleHook/BoostIncludePath.props.user.template
@@ -5,6 +5,6 @@
 	Set the path below to where the boost library is located on your machine, and rename this file to "BoostIncludePath.props.user".
 	NOTE: If the project is currently open in Visual Studio, you must unload the project/solution and re-open it for any changes to take effect.
 	-->
-    <BoostIncludePath>C:\third-party-libraries\boost-1.57.0</BoostIncludePath>
+    <BoostIncludePath>C:\third-party-libraries\boost-1.76.0</BoostIncludePath>
   </PropertyGroup>
 </Project>
diff --git a/ConsoleHook/ConsoleHook.vcxproj b/ConsoleHook/ConsoleHook.vcxproj
@@ -90,7 +90,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <BoostIncludePath>G:\gitstuff\boost_1_59_0</BoostIncludePath>
+    <BoostIncludePath>C:\gitstuff\boost_1_76_0</BoostIncludePath>
   </PropertyGroup>
   <Import Project="BoostIncludePath.props.user" Condition="exists('BoostIncludePath.props.user')" />
   <PropertyGroup>
@@ -149,7 +149,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -179,7 +178,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -213,7 +211,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -243,7 +240,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/ConsoleHook/stdafx.h b/ConsoleHook/stdafx.h
@@ -28,13 +28,10 @@
 #include <string>
 #include <chrono>
 
-#pragma warning(push)
-#pragma warning(disable: 4244 4267 4511 4512 4702)
 #include <boost/format.hpp>
 #include <boost/mem_fn.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#pragma warning(pop)
 
 #include "../shared/SharedMemory.h"
 #include "../shared/Structures.h"

diff --git a/ConsoleWow/ConsoleWow.vcxproj b/ConsoleWow/ConsoleWow.vcxproj
@@ -110,7 +110,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -136,7 +135,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/ConsoleZ.sln b/ConsoleZ.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleHook", "ConsoleHook\ConsoleHook.vcxproj", "{69234D74-7133-48FF-8DDB-9901FFC4D7FF}"
 EndProject
@@ -99,4 +99,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4805768E-9727-4032-91A0-526AE67C6827}
+	EndGlobalSection
 EndGlobal
diff --git a/Packaging/Packaging.vcxproj b/Packaging/Packaging.vcxproj
@@ -38,8 +38,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/help/help.vcxproj b/help/help.vcxproj
@@ -50,8 +50,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/l10n/l10n.vcxproj b/l10n/l10n.vcxproj
@@ -24,13 +24,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Legacy|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,5 @@ l10n/*/resource.h
		l10n//.ucs2.rc

		icons/*/

		Backup/