X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a5f8668e8c7358c8f3b36f09621eea4a659e291..dc5960727c6161aaf98e512e396ae1a021326de8:/include/wx/build.h diff --git a/include/wx/build.h b/include/wx/build.h index 833807da0c..9b0413b91c 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -5,7 +5,7 @@ // Modified by: // Created: 07.05.02 // RCS-ID: $Id$ -// Copyright: (c) 2002 Vadim Zeitlin +// Copyright: (c) 2002 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -41,12 +41,24 @@ #define __WX_BO_UNICODE "ANSI" #endif -// GCC and Intel C++ share same C++ ABI, check if compiler versions are -// compatible: -#if (defined(__GNUG__) || defined(__INTEL_COMPILER) && \ - defined(__GXX_ABI_VERSION)) +// GCC and Intel C++ share same C++ ABI (and possibly others in the future), +// check if compiler versions are compatible: +#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++" +#elif defined(__BORLANDC__) + #define __WX_BO_COMPILER ",Borland C++" +#elif defined(__DIGITALMARS__) + #define __WX_BO_COMPILER ",DigitalMars" +#elif defined(__WATCOMC__) + #define __WX_BO_COMPILER ",Watcom C++" #else #define __WX_BO_COMPILER #endif