From cb979facf33ee1614006b70626aacad444e90826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 1 Feb 2004 18:54:39 +0000 Subject: [PATCH] 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 --- src/common/dynlib.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index f8d9e8db9b..023ff4fe2a 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -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 }