Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-26 17:18:41 +02:00
Code Issues Releases Wiki Activity

Modules should go into <prefix>/<libdir>/audacity/modules on Linux

Browse Source
This commit is contained in:
Leland Lucius 2021-05-06 00:47:27 -05:00
parent 72c5ed863c
commit 25089ff3ee
3 changed files with 9 additions and 2 deletions

2
modules/CMakeLists.txt

@ -11,7 +11,7 @@ add_subdirectory( mod-script-pipe )
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
install( DIRECTORY "${_DEST}/modules" install( DIRECTORY "${_DEST}/modules"
DESTINATION "${_PKGDATA}" ) DESTINATION "${_PKGLIB}" )
endif() endif()
endif() endif()

7
src/AudacityApp.cpp

@ -1114,6 +1114,9 @@ bool AudacityApp::OnInit()
FilePaths audacityPathList; FilePaths audacityPathList;
#ifdef __WXGTK__ #ifdef __WXGTK__
// Make sure install prefix is set so wxStandardPath resolves paths properly
wxStandardPaths::Get().SetInstallPrefix(wxT(INSTALL_PREFIX));
/* Search path (for plug-ins, translations etc) is (in this order): /* Search path (for plug-ins, translations etc) is (in this order):
* The AUDACITY_PATH environment variable * The AUDACITY_PATH environment variable
* The current directory * The current directory
@ -1153,6 +1156,8 @@ bool AudacityApp::OnInit()
FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.%s-files"), FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.%s-files"),
home, wxT(AUDACITY_NAME)), home, wxT(AUDACITY_NAME)),
audacityPathList); audacityPathList);
FileNames::AddUniquePathToPathList(FileNames::ModulesDir(),
audacityPathList);
FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/%s"), FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/%s"),
wxT(INSTALL_PREFIX), wxT(AUDACITY_NAME)), wxT(INSTALL_PREFIX), wxT(AUDACITY_NAME)),
audacityPathList); audacityPathList);
@ -1163,6 +1168,8 @@ bool AudacityApp::OnInit()
FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.audacity-files"), FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/.audacity-files"),
home), home),
audacityPathList) audacityPathList)
FileNames::AddUniquePathToPathList(FileNames::ModulesDir(),
audacityPathList);
FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/audacity"), FileNames::AddUniquePathToPathList(wxString::Format(wxT("%s/share/audacity"),
wxT(INSTALL_PREFIX)), wxT(INSTALL_PREFIX)),
audacityPathList); audacityPathList);

2
src/FileNames.cpp

@ -343,7 +343,7 @@ FilePath FileNames::BaseDir()
baseDir = PlatformCompatibility::GetExecutablePath(); baseDir = PlatformCompatibility::GetExecutablePath();
#else #else
// Linux goes into /*prefix*/share/audacity/ // Linux goes into /*prefix*/share/audacity/
baseDir = FileNames::LowerCaseAppNameInPath(wxStandardPaths::Get().GetDataDir()); baseDir = FileNames::LowerCaseAppNameInPath(wxStandardPaths::Get().GetPluginsDir());
#endif #endif
return baseDir.GetPath(); return baseDir.GetPath();