Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
LoRd_MuldeR 2022-06-16 15:49:19 +02:00
parent 7605972d02
commit 7410d11e5e
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MUtilities_VS2019.vcxproj
View File

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

1
MUtilities_VS2022.vcxproj
View File

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

6
include/MUtils/Version.h
View File

@ -67,7 +67,11 @@ namespace MUtils
#error Compiler is not supported! #error Compiler is not supported!
#endif #endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#if (_MSC_VER == 1930) #if (_MSC_VER == 1932)
"MSVC 2022.2";
#elif (_MSC_VER == 1931)
"MSVC 2022.1";
#elif (_MSC_VER == 1930)
#if (_MSC_FULL_VER <= 193030706) #if (_MSC_FULL_VER <= 193030706)
"MSVC 2022.0"; "MSVC 2022.0";
#else #else

2
src/Terminal_Win32.cpp
View File

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