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

Merge pull request #685 from tresf/stable-1.0

Browse Source 
SWH Clang Fixes, Apple Installer Fixes
This commit is contained in:
Tobias Doerffel
2014-05-06 09:39:22 +02:00
parent 55217ac637 1c4ab566d9
commit b9d51f0a40
13 changed files with 217 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/config_mgr.cpp
View File

@@ -344,8 +344,10 @@ void configManager::loadConfigFile()
if( m_ladDir.isEmpty() || m_ladDir == QDir::separator() ||
( !m_ladDir.contains( ':' ) && !QDir( m_ladDir ).exists() ) )
{
#ifdef LMMS_BUILD_WIN32
#if defined(LMMS_BUILD_WIN32)
m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
#elif defined(LMMS_BUILD_APPLE)
m_ladDir = qApp->applicationDirPath() + "/../lib/lmms/ladspa/";
#else
m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/ladspa/";
#endif