From c2c309653074e30b274e0b4bb8895ab2b88fb00a Mon Sep 17 00:00:00 2001 From: David Connet Date: Tue, 5 Mar 2019 23:28:20 +0100 Subject: [PATCH] Detect MSVS 2019 in msvc/wx/setup.h correctly _MSC_VER 1920 should be detected as MSVS 2019, which corresponds to 14.2 toolset value, rather than 14.1. --- include/msvc/wx/setup.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h index e8407379e5..375c70e04b 100644 --- a/include/msvc/wx/setup.h +++ b/include/msvc/wx/setup.h @@ -65,8 +65,10 @@ #define wxCOMPILER_PREFIX vc120 #elif _MSC_VER == 1900 #define wxCOMPILER_PREFIX vc140 - #elif _MSC_VER >= 1910 && _MSC_VER < 2000 + #elif _MSC_VER >= 1910 && _MSC_VER < 1920 #define wxCOMPILER_PREFIX vc141 + #elif _MSC_VER >= 1920 && _MSC_VER < 2000 + #define wxCOMPILER_PREFIX vc142 #else #error "Unknown MSVC compiler version, please report to wx-dev." #endif