X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f86f607c9937b53b73ac9e850a5fa3e28ebc7b15..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/build.h diff --git a/include/wx/build.h b/include/wx/build.h index e660e39114..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 @@ -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 \ { \