fix for Borland Dll build (SF bug #972989)

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

diff --git a/include/wx/build.h b/include/wx/build.h
index 76b563a67534a19658602c64fdaa2f34d2c10e0c..d847103dbcad62d39cab273a0f7519deeb97aaed 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/build.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/build.h

-// Purpose:     wxBuildOptions class declaration
-// Author:      Vadim Zeitlin
+// Purpose:     Runtime build options checking
+// Author:      Vadim Zeitlin, Vaclav Slavik

 // Modified by:
 // Created:     07.05.02
 // RCS-ID:      $Id$
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -14,42 +14,110 @@
 
 #include "wx/version.h"
 
 
 #include "wx/version.h"
 

+// ----------------------------------------------------------------------------
+// WX_BUILD_OPTIONS_SIGNATURE
+// ----------------------------------------------------------------------------
+
+#define __WX_BO_STRINGIZE(x)   __WX_BO_STRINGIZE0(x)
+#define __WX_BO_STRINGIZE0(x)  #x
+
+#if (wxMINOR_VERSION % 2) == 0
+    #define __WX_BO_VERSION(x,y,z) \
+        __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y)
+#else
+    #define __WX_BO_VERSION(x,y,z) \
+        __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) "." __WX_BO_STRINGIZE(z)
+#endif
+
+#ifdef __WXDEBUG__
+    #define __WX_BO_DEBUG "debug"
+#else
+    #define __WX_BO_DEBUG "no debug"
+#endif
+
+#if wxUSE_UNICODE
+    #define __WX_BO_UNICODE "Unicode"
+#else
+    #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))
+    #define __WX_BO_COMPILER \
+            ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+#else
+    #define __WX_BO_COMPILER
+#endif
+
+// WXWIN_COMPATIBILITY macros affect presence of virtual functions
+#if WXWIN_COMPATIBILITY_2_2
+    #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
+#else
+    #define __WX_BO_WXWIN_COMPAT_2_2
+#endif
+#if WXWIN_COMPATIBILITY_2_4
+    #define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
+#else
+    #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_STL \
+     __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
+     ")"
+
+
+// ----------------------------------------------------------------------------
+// WX_CHECK_BUILD_OPTIONS
+// ----------------------------------------------------------------------------
+
+// Use this macro to check build options. Adding it to a file in DLL will
+// ensure that the DLL checks build options in same way IMPLEMENT_APP() does.
+#define WX_CHECK_BUILD_OPTIONS(libName)                                 \
+    static bool wxCheckBuildOptions()                                   \
+    {                                                                   \
+        wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,     \
+                                        libName);                       \
+        return true;                                                    \
+    };                                                                  \
+    static bool gs_buildOptionsCheck = wxCheckBuildOptions();
+
+
+#if WXWIN_COMPATIBILITY_2_4
+

 // ----------------------------------------------------------------------------
 // wxBuildOptions
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxBuildOptions
 // ----------------------------------------------------------------------------
 

+// NB: Don't use this class in new code, it relies on the ctor being always
+//     inlined. WX_BUILD_OPTIONS_SIGNATURE always works.

 class wxBuildOptions
 {
 public:
     // the ctor must be inline to get the compilation settings of the code
     // which included this header
 class wxBuildOptions
 {
 public:
     // the ctor must be inline to get the compilation settings of the code
     // which included this header

-    wxBuildOptions()
-    {
-        // debug/release
-#ifdef __WXDEBUG__
-        m_isDebug = TRUE;
-#else
-        m_isDebug = FALSE;
-#endif
-
-        // version: we don't test the micro version as hopefully changes
-        // between 2 micro versions don't result in fatal compatibility
-        // problems
-        m_verMaj = wxMAJOR_VERSION;
-        m_verMin = wxMINOR_VERSION;
-    }
+    wxBuildOptions() : m_signature(WX_BUILD_OPTIONS_SIGNATURE) {}

 
 private:
 
 private:

-    // the version
-    int m_verMaj,
-        m_verMin;
-
-    // compiled with __WXDEBUG__?
-    bool m_isDebug;
+    const char *m_signature;

 
     // actually only CheckBuildOptions() should be our friend but well...
 
     // actually only CheckBuildOptions() should be our friend but well...

-    friend class wxAppBase;
+    friend class wxAppConsole;

 };
 
 };
 

-#endif // _WX_BUILD_H_
+#endif // WXWIN_COMPATIBILITY_2_4

 
 

+#endif // _WX_BUILD_H_