X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1dc9f8394c1488ad8e7d945e6f943f7b34554ce..0995b9dc18a7ce898c1c1be0e2790b258cab0fee:/include/wx/build.h?ds=inline diff --git a/include/wx/build.h b/include/wx/build.h index 5141afcbc7..722f0dd031 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -15,7 +15,7 @@ #include "wx/version.h" // NB: This file contains macros for checking binary compatibility of libraries -// in multilib buildm, plugins and user components. +// in multilib builds, plugins and user components. // The WX_BUILD_OPTIONS_SIGNATURE macro expands into string that should // uniquely identify binary compatible builds: i.e. if two builds of the // library are binary compatible, their signature string should be the @@ -42,14 +42,10 @@ __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" +#if wxUSE_UNICODE_UTF8 + #define __WX_BO_UNICODE "UTF-8" +#elif wxUSE_UNICODE_WCHAR + #define __WX_BO_UNICODE "wchar_t" #else #define __WX_BO_UNICODE "ANSI" #endif @@ -65,7 +61,7 @@ #define __WX_BO_COMPILER ",GCC " \ __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) #elif defined(__VISUALC__) - #define __WX_BO_COMPILER ",Visual C++" + #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) #elif defined(__BORLANDC__) #define __WX_BO_COMPILER ",Borland C++" #elif defined(__DIGITALMARS__) @@ -89,7 +85,7 @@ #endif // deriving wxWin containers from STL ones changes them completely: -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #define __WX_BO_STL ",STL containers" #else #define __WX_BO_STL ",wx containers" @@ -98,7 +94,7 @@ // 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_UNICODE \ __WX_BO_COMPILER \ __WX_BO_STL \ __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \ @@ -110,7 +106,7 @@ // ---------------------------------------------------------------------------- // 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. +// ensure that the DLL checks build options in same way wxIMPLEMENT_APP() does. #define WX_CHECK_BUILD_OPTIONS(libName) \ static struct wxBuildOptionsChecker \ { \