Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-19 22:35:10 +03:00
Code Activity

Enables side by side installation of Companion 2.1 and 2.0 on Linux

Browse source 
Adds missing simulator libraries on Linux
Installs Standalone Simulator icon on Linux
This commit is contained in:
Damjan Adamic 2015-07-19 13:59:08 +02:00
parent 41d0675886
commit b1170b2ab9
6 changed files with 62 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
companion/src/simulation/simulatorinterface.cpp
View file

@ -4,6 +4,7 @@
#include <QLibrary>
#include <QMap>
#include <QMessageBox>
#include "version.h"
QMap<QString, SimulatorFactory *> registered_simulators;
@ -29,6 +30,7 @@ void registerSimulator(const QString &filename)
void registerSimulators()
{
bool simulatorsFound = false;
QDir dir(".");
QStringList filters;
#if (!defined __GNUC__) || (defined __CYGWIN__)
@ -36,9 +38,21 @@ void registerSimulators()
#else
filters << "*-simulator.so";
#endif
foreach(QString filename, dir.entryList(filters, QDir::Files)) {
registerSimulator(filename.prepend("./"));
simulatorsFound = true;
}
#if !( (!defined __GNUC__) || (defined __CYGWIN__) )
if (!simulatorsFound) {
dir = SIMULATOR_LIB_SEARCH_PATH;
foreach(QString filename, dir.entryList(filters, QDir::Files)) {
registerSimulator(filename.prepend(dir.path() + "/"));
simulatorsFound = true;
}
}
#endif
}
SimulatorFactory *getSimulatorFactory(const QString &name)