diff --git a/remaken_arch_define.pri b/remaken_arch_define.pri index 25c6358..8165812 100644 --- a/remaken_arch_define.pri +++ b/remaken_arch_define.pri @@ -210,8 +210,8 @@ isEmpty(REMAKEN_TARGET_PLATFORM) { } greaterThan(QMAKE_MSC_VER, 1930) { # Visual Studio 2022 (14.x with x >= 30) / Visual C++ 19.30 and up - # Note : msvc version set to 14.1 - TODO change to 14.30?? - REMAKEN_COMPILER_VER = 14.1 + # Note : msvc version set to 14.3 + REMAKEN_COMPILER_VER = 14.3 equals(CONAN_MAJOR_VERSION,1) { CONAN_WIN_COMPILER_VERSION = 17 } @@ -219,6 +219,17 @@ isEmpty(REMAKEN_TARGET_PLATFORM) { CONAN_WIN_COMPILER_VERSION = 193 } } + greaterThan(QMAKE_MSC_VER, 1939) { + # Visual Studio 2022 (14.x with x >= 40) / Visual C++ 19.40 and up + # Note : msvc version set to 14.3 + REMAKEN_COMPILER_VER = 14.3 + equals(CONAN_MAJOR_VERSION,1) { + CONAN_WIN_COMPILER_VERSION = 17 + } + else { + CONAN_WIN_COMPILER_VERSION = 194 + } + } } contains(CONFIG,c++14)|contains(CONFIG,c++1z)|contains(CONFIG,c++17)|contains(CONFIG,c++2a)|contains(CONFIG,c++20) { contains(CONFIG,c++11) {