Merge pull request #2861 from tresf/master

Fix building on older Apple versions
This commit is contained in:
Tres Finocchiaro
2016-06-22 23:31:07 -04:00
committed by GitHub
12 changed files with 61 additions and 20 deletions

View File

@@ -181,6 +181,14 @@ bool RemotePlugin::init( const QString &pluginExecutable,
m_failed = false;
}
QString exec = QFileInfo(QDir("plugins:"), pluginExecutable).absoluteFilePath();
#ifdef LMMS_BUILD_APPLE
// search current directory first
QString curDir = QCoreApplication::applicationDirPath() + "/" + pluginExecutable;
if( QFile( curDir ).exists() )
{
exec = curDir;
}
#endif
#ifdef LMMS_BUILD_WIN32
if( ! exec.endsWith( ".exe", Qt::CaseInsensitive ) )
{