Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use x.y.z version in unstable branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-01 18:54:39 +00:00
parent c79241a238
commit cb979facf3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/dynlib.cpp
View File

@@ -496,14 +496,21 @@ wxString wxDynamicLibrary::GetPluginsDirectory()
{ {
#ifdef __UNIX__ #ifdef __UNIX__
wxString format = wxGetInstallPrefix(); wxString format = wxGetInstallPrefix();
wxString dir;
format << wxFILE_SEP_PATH format << wxFILE_SEP_PATH
<< wxT("lib") << wxFILE_SEP_PATH << wxT("lib") << wxFILE_SEP_PATH
<< wxT("wx") << wxFILE_SEP_PATH << wxT("wx") << wxFILE_SEP_PATH
#if (wxMINOR_VERSION % 2) == 0
<< wxT("%i.%i"); << wxT("%i.%i");
wxString dir;
dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION); dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
return dir;
#else #else
<< wxT("%i.%i.%i");
dir.Printf(format.c_str(),
wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
#endif
return dir;
#else // ! __UNIX__
return wxEmptyString; return wxEmptyString;
#endif #endif
} }