use x.y.z version in unstable branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c79241a238
commit
cb979facf3
@ -496,14 +496,21 @@ wxString wxDynamicLibrary::GetPluginsDirectory()
|
||||
{
|
||||
#ifdef __UNIX__
|
||||
wxString format = wxGetInstallPrefix();
|
||||
wxString dir;
|
||||
format << wxFILE_SEP_PATH
|
||||
<< wxT("lib") << wxFILE_SEP_PATH
|
||||
<< wxT("wx") << wxFILE_SEP_PATH
|
||||
#if (wxMINOR_VERSION % 2) == 0
|
||||
<< wxT("%i.%i");
|
||||
wxString dir;
|
||||
dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
|
||||
return dir;
|
||||
#else
|
||||
<< wxT("%i.%i.%i");
|
||||
dir.Printf(format.c_str(),
|
||||
wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
|
||||
#endif
|
||||
return dir;
|
||||
|
||||
#else // ! __UNIX__
|
||||
return wxEmptyString;
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user