flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T103, executable file path moved to CDirectoryUtils::executableFilePath

Browse Source
This commit is contained in:
Klaus Basan
2017-07-06 23:56:11 +02:00
committed by Mathew Sutcliffe
parent 3245ff4ef4
commit caf358401f
5 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -265,13 +265,7 @@ void CSwiftLauncher::startSwiftCore()
// I set this for debug purpose only
m_executableArgs = args;
m_executable.clear();
m_executable = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), CBuildConfig::swiftCoreExecutableName());
if (CBuildConfig::isRunningOnMacOSXPlatform())
{
m_executable += QLatin1String(".app/Contents/MacOS/");
m_executable += CBuildConfig::swiftCoreExecutableName();
}
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftCoreExecutableName());
CLogMessage(this).info(this->getCmdLine());
// start
@@ -281,24 +275,14 @@ void CSwiftLauncher::startSwiftCore()
void CSwiftLauncher::setSwiftDataExecutable()
{
m_executable.clear();
m_executable = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), CBuildConfig::swiftDataExecutableName());
if (CBuildConfig::isRunningOnMacOSXPlatform())
{
m_executable += QLatin1String(".app/Contents/MacOS/");
m_executable += CBuildConfig::swiftDataExecutableName();
}
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftDataExecutableName());
m_executableArgs.clear();
}
bool CSwiftLauncher::setSwiftGuiExecutable()
{
m_executable.clear();
m_executable = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), CBuildConfig::swiftGuiExecutableName());
if (CBuildConfig::isRunningOnMacOSXPlatform())
{
m_executable += QLatin1String(".app/Contents/MacOS/");
m_executable += CBuildConfig::swiftGuiExecutableName();
}
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftGuiExecutableName());
QStringList args
{