From b6b7566aab4863e8241ee79fed38dc46108552a2 Mon Sep 17 00:00:00 2001 From: cbucher Date: Sun, 6 Jun 2021 14:26:52 +0200 Subject: [PATCH] VS2019 and Boost 1.76 --- .gitignore | 2 ++ Console/BoostIncludePath.props.user.template | 2 +- Console/Console.vcxproj | 6 +----- Console/stdafx.h | 15 ++------------- ConsoleHook/BoostIncludePath.props.user.template | 2 +- ConsoleHook/ConsoleHook.vcxproj | 6 +----- ConsoleHook/stdafx.h | 5 +---- ConsoleWow/ConsoleWow.vcxproj | 2 -- ConsoleZ.sln | 7 +++++-- Packaging/Packaging.vcxproj | 3 +-- help/help.vcxproj | 3 +-- l10n/l10n.vcxproj | 6 ++---- 12 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index bd79b680..bab49baa 100644 --- 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 index 6b954cf0..3355ce11 100644 --- 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. --> - C:\third-party-libraries\boost-1.57.0 + C:\third-party-libraries\boost-1.76.0 \ No newline at end of file diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj index 78ae2891..5129c0b5 100644 --- a/Console/Console.vcxproj +++ b/Console/Console.vcxproj @@ -88,7 +88,7 @@ - G:\gitstuff\boost_1_59_0 + C:\gitstuff\boost_1_76_0 @@ -173,7 +173,6 @@ Disabled ../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -229,7 +228,6 @@ copy "..\setup\dlls\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\"Disabled ../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_USE_AERO;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -285,7 +283,6 @@ copy "..\setup\dlls\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\"Disabled ../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -341,7 +338,6 @@ copy "..\setup\dlls\x64\FreeImagePlus.dll" "..\bin\$(Platform)\$(Configuration)\ Disabled ../TabbingFramework;../wtl/wtl/include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_USE_AERO;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use diff --git a/Console/stdafx.h b/Console/stdafx.h index 9177f8c3..dfa2364b 100644 --- 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 extern CAppModule _Module; @@ -112,10 +112,6 @@ an alternative solution is to add an additional library to your linker input, le #include #endif -#pragma warning(disable: 4503) // disables 'name truncated' warnings - -#pragma warning(push) -#pragma warning(disable: 4702) #include #include #include @@ -127,25 +123,18 @@ an alternative solution is to add an additional library to your linker input, le #include #include #include -#pragma warning(pop) -#pragma warning(push) -#pragma warning(disable: 4244 4267 4511 4512 701 4702) #define BOOST_ALL_NO_LIB -#include +#include #include #include #include -#pragma warning(pop) -#pragma warning(push) -#pragma warning(disable: 4510 4610) #include #include #include #include using namespace boost::multi_index; -#pragma warning(pop) #include #if _WIN32_WINNT >= 0x0600 diff --git a/ConsoleHook/BoostIncludePath.props.user.template b/ConsoleHook/BoostIncludePath.props.user.template index 6b954cf0..3355ce11 100644 --- 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. --> - C:\third-party-libraries\boost-1.57.0 + C:\third-party-libraries\boost-1.76.0 \ No newline at end of file diff --git a/ConsoleHook/ConsoleHook.vcxproj b/ConsoleHook/ConsoleHook.vcxproj index b196d848..dfdaa671 100644 --- a/ConsoleHook/ConsoleHook.vcxproj +++ b/ConsoleHook/ConsoleHook.vcxproj @@ -90,7 +90,7 @@ - G:\gitstuff\boost_1_59_0 + C:\gitstuff\boost_1_76_0 @@ -149,7 +149,6 @@ Disabled WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -179,7 +178,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu Disabled WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -213,7 +211,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu Disabled WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -243,7 +240,6 @@ copy "..\bin\$(Platform)\$(Configuration)\ConsoleHook.dll" "..\bin\x64\$(Configu Disabled WIN32;_WINDOWS;_USRDLL;CONSOLEHOOK_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use diff --git a/ConsoleHook/stdafx.h b/ConsoleHook/stdafx.h index 03a52354..d8a88260 100644 --- a/ConsoleHook/stdafx.h +++ b/ConsoleHook/stdafx.h @@ -28,13 +28,10 @@ #include #include -#pragma warning(push) -#pragma warning(disable: 4244 4267 4511 4512 4702) #include #include -#include +#include #include -#pragma warning(pop) #include "../shared/SharedMemory.h" #include "../shared/Structures.h" diff --git a/ConsoleWow/ConsoleWow.vcxproj b/ConsoleWow/ConsoleWow.vcxproj index 53ebb122..c89cf89e 100644 --- a/ConsoleWow/ConsoleWow.vcxproj +++ b/ConsoleWow/ConsoleWow.vcxproj @@ -110,7 +110,6 @@ Disabled WIN32;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -136,7 +135,6 @@ Disabled WIN32;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use diff --git a/ConsoleZ.sln b/ConsoleZ.sln index 83e8dae9..5d0bdfdd 100644 --- 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 index 0c5ba39f..39f356b3 100644 --- a/Packaging/Packaging.vcxproj +++ b/Packaging/Packaging.vcxproj @@ -38,8 +38,7 @@ Makefile - false - v141 + v142 diff --git a/help/help.vcxproj b/help/help.vcxproj index d7c11693..72fbaaa1 100644 --- a/help/help.vcxproj +++ b/help/help.vcxproj @@ -50,8 +50,7 @@ Makefile - false - v141 + v142 diff --git a/l10n/l10n.vcxproj b/l10n/l10n.vcxproj index 40b082d9..0b633b0d 100644 --- a/l10n/l10n.vcxproj +++ b/l10n/l10n.vcxproj @@ -24,13 +24,11 @@ Makefile - false - v141 + v142 Makefile - false - v141 + v142