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

fixed version number expansion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-04 13:13:21 +00:00
parent 538b7569e5
commit 3546ffaefd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/dynlib.cpp
View File

@@ -449,23 +449,25 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
if ( !suffix.empty() ) if ( !suffix.empty() )
suffix = wxString(_T("_")) + suffix; suffix = wxString(_T("_")) + suffix;
#define WXSTRINGIZE(x) #x
#ifdef __UNIX__ #ifdef __UNIX__
#if (wxMINOR_VERSION % 2) == 0 #if (wxMINOR_VERSION % 2) == 0
#define wxDLLVER(x,y,z) "-" #x "." #y #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
#else #else
#define wxDLLVER(x,y,z) "-" #x "." #y "." #z #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z)
#endif #endif
#else #else
#if (wxMINOR_VERSION % 2) == 0 #if (wxMINOR_VERSION % 2) == 0
#define wxDLLVER(x,y,z) #x #y #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y)
#else #else
#define wxDLLVER(x,y,z) #x #y #z #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z)
#endif #endif
#endif #endif
suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION, suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
wxRELEASE_NUMBER)); wxRELEASE_NUMBER));
#undef wxDLLVER #undef wxDLLVER
#undef WXSTRINGIZE
return CanonicalizeName(name + suffix, wxDL_MODULE); return CanonicalizeName(name + suffix, wxDL_MODULE);
} }