OSDN > Finden Software > MUtilities > SCM > git > MUtilities > Commit

MUtilities
Fork

MUtilities: Commit

MUtilities development repository

Added support for newer version of VS2022 + ignore the same warnings in "Release" configuration as in "Release_Static" configuration.

--- a/MUtilities_VS2019.vcxproj

+++ b/MUtilities_VS2019.vcxproj

		@@ -199,6 +199,7 @@
199	199	<MinimalRebuild>false</MinimalRebuild>
200	200	<ControlFlowGuard>false</ControlFlowGuard>
201	201	<WholeProgramOptimization>true</WholeProgramOptimization>
	202	+ <DisableSpecificWarnings>4714;4324;4127</DisableSpecificWarnings>
202	203	</ClCompile>
203	204	<Link>
204	205	<SubSystem>Windows</SubSystem>

--- a/MUtilities_VS2022.vcxproj

+++ b/MUtilities_VS2022.vcxproj

		@@ -199,6 +199,7 @@
199	199	<MinimalRebuild>false</MinimalRebuild>
200	200	<ControlFlowGuard>false</ControlFlowGuard>
201	201	<WholeProgramOptimization>true</WholeProgramOptimization>
	202	+ <DisableSpecificWarnings>4714;4324;4127</DisableSpecificWarnings>
202	203	</ClCompile>
203	204	<Link>
204	205	<SubSystem>Windows</SubSystem>

--- a/include/MUtils/Version.h

+++ b/include/MUtils/Version.h

		@@ -67,7 +67,11 @@ namespace MUtils
67	67	#error Compiler is not supported!
68	68	#endif
69	69	#elif defined(_MSC_VER)
70		- #if (_MSC_VER == 1930)
	70	+ #if (_MSC_VER == 1932)
	71	+ "MSVC 2022.2";
	72	+ #elif (_MSC_VER == 1931)
	73	+ "MSVC 2022.1";
	74	+ #elif (_MSC_VER == 1930)
71	75	#if (_MSC_FULL_VER <= 193030706)
72	76	"MSVC 2022.0";
73	77	#else

--- a/src/Terminal_Win32.cpp

+++ b/src/Terminal_Win32.cpp

		@@ -427,7 +427,7 @@ void MUtils::Terminal::set_icon(const QIcon &icon)
427	427	bool success = false;
428	428	if (const SetConsoleIconFun pSetConsoleIconFun = MUtils::Win32Utils::resolve<SetConsoleIconFun>(QLatin1String("kernel32"), QLatin1String("SetConsoleIcon")))
429	429	{
430		- const DWORD before = GetLastError();
	430	+ //const DWORD before = GetLastError();
431	431	if (pSetConsoleIconFun(hIcon))
432	432	{
433	433	success = true;