Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 08:15:13 +03:00
Code Activity

Also search for simulators in companion.exe path on Windows (Fix #3012)

Browse source
This commit is contained in:
Andre Bernet 2015-10-31 10:17:43 +04:00
parent 3b4a6fb49b
commit 22c429a1a7
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,9 @@
#include <QMap> #include <QMap>
#include <QMessageBox> #include <QMessageBox>
#include "version.h" #include "version.h"
#if defined WIN32 || !defined __GNUC__
#include <windows.h>
#endif
QMap<QString, SimulatorFactory *> registered_simulators; QMap<QString, SimulatorFactory *> registered_simulators;
@ -47,10 +50,15 @@ void registerSimulators()
simulatorsFound = true; simulatorsFound = true;
} }
#if defined(__APPLE__) || !( (!defined __GNUC__) || (defined __CYGWIN__) )
if (!simulatorsFound) { if (!simulatorsFound) {
#if defined(__APPLE__) #if defined(__APPLE__)
dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources"; dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources";
#elif (!defined __GNUC__) || (defined __CYGWIN__)
char name[MAX_PATH];
GetModuleFileName(NULL, name, MAX_PATH);
QString path(name);
path.truncate(path.lastIndexOf('\\'));
dir.setPath(path);
#else #else
dir = SIMULATOR_LIB_SEARCH_PATH; dir = SIMULATOR_LIB_SEARCH_PATH;
#endif #endif
@ -59,7 +67,6 @@ void registerSimulators()
simulatorsFound = true; simulatorsFound = true;
} }
} }
#endif
} }
SimulatorFactory *getSimulatorFactory(const QString &name) SimulatorFactory *getSimulatorFactory(const QString &name)