flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 07:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Factor out parts of CFsCommonUtil into new class CFsDirectories

Browse Source 
This breaks the cyclic dependency involving
CSimulatorInfo, CFsCommonUtil, and CAircraftModelList.
This commit is contained in:
Mat Sutcliffe
2020-11-12 22:43:44 +00:00
parent d09336bd26
commit 038c57d149
10 changed files with 800 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/configsimulatorcomponent.cpp
View File

@@ -9,7 +9,7 @@
#include "configsimulatorcomponent.h"
#include "blackgui/guiutility.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/fscommon/fsdirectories.h"
#include "blackconfig/buildconfig.h"
#include "ui_configsimulatorcomponent.h"
@@ -61,9 +61,9 @@ namespace BlackGui
}
// no x64 check as we would allow to config 32bit with launcher x64 and vice versa
const bool p3d = (sims.isP3D() || !CFsCommonUtil::p3dDir().isEmpty()) && CBuildConfig::isCompiledWithP3DSupport();
const bool fsx = (sims.isFSX() || !CFsCommonUtil::fsxDir().isEmpty()) && CBuildConfig::isCompiledWithFsxSupport();
const bool fs9 = (sims.isFS9() || !CFsCommonUtil::fs9Dir().isEmpty()) && CBuildConfig::isCompiledWithFs9Support();
const bool p3d = (sims.isP3D() || !CFsDirectories::p3dDir().isEmpty()) && CBuildConfig::isCompiledWithP3DSupport();
const bool fsx = (sims.isFSX() || !CFsDirectories::fsxDir().isEmpty()) && CBuildConfig::isCompiledWithFsxSupport();
const bool fs9 = (sims.isFS9() || !CFsDirectories::fs9Dir().isEmpty()) && CBuildConfig::isCompiledWithFs9Support();
const bool xp = sims.isXPlane() && CBuildConfig::isCompiledWithXPlaneSupport();
const bool fg = sims.isFG() && CBuildConfig::isCompiledWithFGSupport();