diff --git a/src/FileNames.h b/src/FileNames.h index 0d46fa633..bff19e1e8 100644 --- a/src/FileNames.h +++ b/src/FileNames.h @@ -53,7 +53,7 @@ public: * This returns the string path to where the user may have put plug-ins * if they don't have system admin rights. Under default settings, it's * /Plug-Ins/ */ - static wxString PlugInDir(); // Windows and Mac only + static wxString PlugInDir(); static wxString ThemeDir(); static wxString ThemeComponentsDir(); static wxString ThemeCachePng(); diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index b1237963c..2b2050f7a 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -1437,13 +1437,11 @@ void PluginManager::FindFilesInPathList(const wxString & pattern, wxArrayString paths; - // Add the "per-user" plug-ins directory Windows / Mac -#if defined(__WXMAC__) || defined(__WXMSW__) + // Add the "per-user" plug-ins directory { const wxFileName &ff = FileNames::PlugInDir(); paths.Add(ff.GetFullPath()); } -#endif // Add the "Audacity" plug-ins directory wxFileName ff = PlatformCompatibility::GetExecutablePath(); diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index fc3c82583..8b36b5428 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -2024,6 +2024,7 @@ wxArrayString NyquistEffect::GetNyquistSearchPath() wxGetApp().AddUniquePathToPathList(prefix + wxT("plugins"), pathList); wxGetApp().AddUniquePathToPathList(prefix + wxT("plug-ins"), pathList); } + pathList.Add(FileNames::PlugInDir()); return pathList; }