Made the version conflict error message a bit more helpful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -446,8 +446,23 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
|
|||||||
|
|
||||||
if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
|
if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
|
||||||
{
|
{
|
||||||
wxLogFatalError(_T("Mismatch between the program and library build ")
|
wxString msg;
|
||||||
_T("versions detected."));
|
wxString libDebug, progDebug;
|
||||||
|
|
||||||
|
if (isDebug)
|
||||||
|
libDebug = wxT("debug");
|
||||||
|
else
|
||||||
|
libDebug = wxT("no debug");
|
||||||
|
|
||||||
|
if (opts.m_isDebug)
|
||||||
|
progDebug = wxT("debug");
|
||||||
|
else
|
||||||
|
progDebug = wxT("no debug");
|
||||||
|
|
||||||
|
msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %d.%d (%s), and your program used %d.%d (%s)."),
|
||||||
|
verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
|
||||||
|
|
||||||
|
wxLogFatalError(msg);
|
||||||
|
|
||||||
// normally wxLogFatalError doesn't return
|
// normally wxLogFatalError doesn't return
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Reference in New Issue
Block a user