Remove some cruft

[wxWidgets.git] / include / wx / build.h

diff --git a/include/wx/build.h b/include/wx/build.h
index 3c926f3c1873899f558caebd70e29ef7621357af..60b8da0f4a7f0b5b4bc5658a4a89186dab4e00d7 100644 (file)
--- 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 <vadim@wxwindows.org>
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -41,27 +41,61 @@
     #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__)
+
+    #if __BORLANDC__ >= 0x600                        /* BCCX */
+        #define __WX_BO_COMPILER_VER " 6.0"
+    #elif __BORLANDC__ >= 0x570                      /* Kylix */
+        #define __WX_BO_COMPILER_VER " 5.7"
+    #elif __BORLANDC__ >= 0x560                      /* BCB++ 6 */
+        #define __WX_BO_COMPILER_VER " 5.6"
+    #elif __BORLANDC__ >= 0x550                      /* BCB++ 5, free command line */
+        #define __WX_BO_COMPILER_VER " 5.5"
+    #elif __BORLANDC__ >= 0x520                      /* BCB++ 1-4 */
+        #define __WX_BO_COMPILER_VER " 5.02"
+    #elif __BORLANDC__ >= 0x500                      /* BC++ 5 */
+        #define __WX_BO_COMPILER_VER " 5.0"
+    #elif __BORLANDC__ >= 0x452                      /* BC++ 4 */
+        #define __WX_BO_COMPILER_VER " 4.0"
+    #elif __BORLANDC__ >= 0x410                      /* BC++ 3.1 */
+        #define __WX_BO_COMPILER_VER " 3.1"
+    #elif __BORLANDC__ >= 0x400                      /* BC++ 3.0 */
+        #define __WX_BO_COMPILER_VER " 3.0"
+    #elif __BORLANDC__ >= 0x200                      /* BC++ 2.0 */
+        #define __WX_BO_COMPILER_VER " 2.0"
+    #else
+        #define __WX_BO_COMPILER_VER
+    #endif
+
+    #define __WX_BO_COMPILER ",Borland C++" __WX_BO_COMPILER_VER
+
+#elif defined(__DIGITALMARS__)
+
+    #if defined(__DMC_VERSION_STRING__)
+        #define __WX_BO_COMPILER "," __DMC_VERSION_STRING__
+    #else
+        #define __WX_BO_COMPILER ",DigitalMars"
+    #endif
+
+#elif defined(__WATCOMC__)
+    #define __WX_BO_COMPILER ",Watcom C++"
 #else
     #define __WX_BO_COMPILER
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
-#if WXWIN_COMPATIBILITY
-    #define __WX_BO_WXWIN_COMPAT_1_68 ",compatible with 1.68"
-#else
-    #define __WX_BO_WXWIN_COMPAT_1_68
-#endif
-#if WXWIN_COMPATIBILITY_2
-    #define __WX_BO_WXWIN_COMPAT_2_0 ",compatible with 2.0"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_0
-#endif
 #if WXWIN_COMPATIBILITY_2_2
     #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
 #else
@@ -73,13 +107,19 @@
     #define __WX_BO_WXWIN_COMPAT_2_4
 #endif
 
-        
+// deriving wxWin containers from STL ones changes them completely:
+#if wxUSE_STL
+    #define __WX_BO_STL ",STL containers"
+#else
+    #define __WX_BO_STL ",wx containers"
+#endif
+ 
 // This macro is passed as argument to wxConsoleApp::CheckBuildOptions()
 #define WX_BUILD_OPTIONS_SIGNATURE \
     __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \
     " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
      __WX_BO_COMPILER \
-     __WX_BO_WXWIN_COMPAT_1_68 __WX_BO_WXWIN_COMPAT_2_0 \
+     __WX_BO_STL \
      __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
      ")"