From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 1 Feb 2004 18:54:39 +0000 (+0000)
Subject: use x.y.z version in unstable branch
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cb979facf33ee1614006b70626aacad444e90826

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
---

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
 }