From 8f4422831aacbec1724472cdab559a3cb5e91524 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Sep 2014 16:14:55 +0000 Subject: [PATCH] Recognize Intel compiler as MSVC one under Windows in the build options. The two compilers are binary compatible and by pretending that Intel compiler is the same as MSVC, we allow using ICC to build applications using DLLs built with MSVC. Closes #9437. (this is a backport of r76425 from trunk). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/build.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/wx/build.h b/include/wx/build.h index 0959a29782..5be137b133 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -54,13 +54,16 @@ #if defined(__GXX_ABI_VERSION) #define __WX_BO_COMPILER \ ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION) -#elif defined(__INTEL_COMPILER) - #define __WX_BO_COMPILER ",Intel C++" #elif defined(__GNUG__) #define __WX_BO_COMPILER ",GCC " \ __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) #elif defined(__VISUALC__) #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) +#elif defined(__INTEL_COMPILER) + // 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 + // allow using it compile the application code using MSVC-built DLLs. + #define __WX_BO_COMPILER ",Intel C++" #elif defined(__BORLANDC__) #define __WX_BO_COMPILER ",Borland C++" #elif defined(__DIGITALMARS__)