Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect MSVS 2019 in msvc/wx/setup.h correctly

Browse Source 
_MSC_VER 1920 should be detected as MSVS 2019, which corresponds to 14.2
toolset value, rather than 14.1.
This commit is contained in:
David Connet
2019-03-05 23:28:20 +01:00
committed by Vadim Zeitlin
parent f670cf2d29
commit c2c3096530
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/msvc/wx/setup.h
View File

@@ -65,8 +65,10 @@
#define wxCOMPILER_PREFIX vc120 #define wxCOMPILER_PREFIX vc120
#elif _MSC_VER == 1900 #elif _MSC_VER == 1900
#define wxCOMPILER_PREFIX vc140 #define wxCOMPILER_PREFIX vc140
#elif _MSC_VER >= 1910 && _MSC_VER < 2000 #elif _MSC_VER >= 1910 && _MSC_VER < 1920
#define wxCOMPILER_PREFIX vc141 #define wxCOMPILER_PREFIX vc141
#elif _MSC_VER >= 1920 && _MSC_VER < 2000
#define wxCOMPILER_PREFIX vc142
#else #else
#error "Unknown MSVC compiler version, please report to wx-dev." #error "Unknown MSVC compiler version, please report to wx-dev."
#endif #endif