hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Apply libdir patch (requires reconfiguring)

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1188 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-06-28 15:12:21 +00:00
parent 8421d4404c
commit 22adcdf61e
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/config_mgr.cpp
View File

@@ -53,13 +53,12 @@ configManager::configManager( void ) :
#endif
),
m_artworkDir( defaultArtworkDir() ),
m_pluginDir( qApp->applicationDirPath()
#ifdef LMMS_BUILD_WIN32
+ QDir::separator() + "plugins" + QDir::separator()
m_pluginDir( qApp->applicationDirPath()
+ QDir::separator() + "plugins" + QDir::separator() ),
#else
.section( '/', 0, -2 ) + "/lib/lmms/"
m_pluginDir( QString( LIBDIR ) + "/lmms/" ),
#endif
),
m_vstDir( QDir::home().absolutePath() ),
m_flDir( QDir::home().absolutePath() )
{
@@ -329,7 +328,7 @@ bool configManager::loadConfigFile( void )
#ifdef LMMS_BUILD_WIN32
m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
#else
m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/";
m_ladDir = QString(LIBDIR) + "/ladspa/:/usr/lib/ladspa/:/usr/local/lib/ladspa/";
#endif
}

2
src/core/ladspa_manager.cpp
View File

@@ -42,6 +42,8 @@ ladspaManager::ladspaManager( void )
ladspaDirectories += configManager::inst()->ladspaDir().split( ':' );
#ifndef LMMS_BUILD_WIN32
ladspaDirectories.push_back( QString( LIBDIR ) + "/lmms/ladspa" );
ladspaDirectories.push_back( QString( LIBDIR ) + "/ladspa" );
ladspaDirectories.push_back( "/usr/lib/lmms/ladspa" );
ladspaDirectories.push_back( "/usr/local/lib/lmms/ladspa" );
ladspaDirectories.push_back( "/usr/lib/ladspa" );