Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Bug 2046 - LAME not found error on 64-bit Mac build shows wrong library (32-bit one)

Browse Source 
Audacity now looks for libmp3lame64bit.dylib on mac.
It also reports 64 bit in the build tab in about Audacity if built for 64 bit.
This commit is contained in:
James Crook 2019-02-09 22:53:47 +00:00
parent d4c8e9e7b9
commit c912b13747
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AboutDialog.cpp
View File

@ -639,10 +639,14 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
// Current date
AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
AddBuildinfoRow(&informationStr, _("Commit Id:"), REV_IDENT );
// Not translated in 2.3.1.
wxString bits = (sizeof(void*) == 8) ? ", 64 bits" : "";
#ifdef __WXDEBUG__
AddBuildinfoRow(&informationStr, _("Build type:"), _("Debug build"));
AddBuildinfoRow(&informationStr, _("Build type:"), wxString(_("Debug build"))+bits );
#else
AddBuildinfoRow(&informationStr, _("Build type:"), _("Release build"));
AddBuildinfoRow(&informationStr, _("Build type:"), wxString(_("Release build"))+bits);
#endif
#ifdef _MSC_FULL_VER

4
src/export/ExportMP3.cpp
View File

@ -1468,11 +1468,15 @@ wxString MP3Exporter::GetLibraryPath()
wxString MP3Exporter::GetLibraryName()
{
if (sizeof(void*) == 8)
return wxT("libmp3lame64bit.dylib");
return wxT("libmp3lame.dylib");
}
wxString MP3Exporter::GetLibraryTypeString()
{
if (sizeof(void*) == 8)
return wxString(_("Only libmp3lame64bit.dylib|libmp3lame64bit.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
return wxString(_("Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
}