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

Use the same ABI version string for MSVS 2017 as for MSVS 2015

Browse Source 
MSVS 2017 (which uses _MSC_VER from 1910 to 1912 currently) is
ABI-compatible with MSVS 2015 (_MSC_VER 1900), so do allow linking code
compiled with one of them with the library built by the other one.

Closes #18024.
This commit is contained in:
kathoum
2017-12-16 15:57:02 +01:00
committed by Vadim Zeitlin
parent 1b6ec5c538
commit f1dfb27cb1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/build.h
View File

@@ -67,7 +67,14 @@
#define __WX_BO_COMPILER ",GCC " \ #define __WX_BO_COMPILER ",GCC " \
__WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
#elif defined(__VISUALC__) #elif defined(__VISUALC__)
#define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) // VC15 (a.k.a. MSVS 2017) is ABI-compatible with VC14 (MSVS 2015), so use
// the same ABI version for both of them.
#if _MSC_VER >= 1900 && _MSC_VER < 2000
#define wxMSVC_ABI_VERSION 1900
#else
#define wxMSVC_ABI_VERSION _MSC_VER
#endif
#define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(wxMSVC_ABI_VERSION)
#elif defined(__INTEL_COMPILER) #elif defined(__INTEL_COMPILER)
// Notice that this must come after MSVC check as ICC under Windows is // Notice that this must come after MSVC check as ICC under Windows is
// ABI-compatible with the corresponding version of the MSVC and we want to // ABI-compatible with the corresponding version of the MSVC and we want to