From db72e55281e631e22c1c0f8fea9ebfac12e25f66 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 29 Dec 2024 14:29:30 +0100 Subject: [PATCH] refactor: Remove separate function to check for sim support --- src/config/buildconfig.h | 3 --- src/config/buildconfig.inc | 5 ----- src/core/context/contextsimulator.cpp | 5 +---- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/config/buildconfig.h b/src/config/buildconfig.h index fae433a95..8a102c421 100644 --- a/src/config/buildconfig.h +++ b/src/config/buildconfig.h @@ -42,9 +42,6 @@ namespace swift::config //! with XPlane support? static constexpr bool isCompiledWithXPlaneSupport(); // defined in buildconfig_gen.inc.in - //! with any simulator libraries - static constexpr bool isCompiledWithFlightSimulatorSupport(); - //! Debug build? static constexpr bool isDebugBuild(); diff --git a/src/config/buildconfig.inc b/src/config/buildconfig.inc index 4ffa76eaa..9ce49eda7 100644 --- a/src/config/buildconfig.inc +++ b/src/config/buildconfig.inc @@ -17,11 +17,6 @@ namespace swift::config return CBuildConfig::isCompiledWithFs9Support() || CBuildConfig::isCompiledWithFsxSupport() || CBuildConfig::isCompiledWithP3DSupport() || isCompiledWithMSFSSupport() || isCompiledWithMSFS2024Support(); } - constexpr bool CBuildConfig::isCompiledWithFlightSimulatorSupport() - { - return CBuildConfig::isCompiledWithMsFlightSimulatorSupport() || CBuildConfig::isCompiledWithXPlaneSupport() || CBuildConfig::isCompiledWithFGSupport(); - } - constexpr bool CBuildConfig::isRunningOnWindowsNtPlatform() { #ifdef Q_OS_WIN diff --git a/src/core/context/contextsimulator.cpp b/src/core/context/contextsimulator.cpp index a54036057..c0692773b 100644 --- a/src/core/context/contextsimulator.cpp +++ b/src/core/context/contextsimulator.cpp @@ -49,10 +49,7 @@ namespace swift::core::context } } - bool IContextSimulator::isSimulatorAvailable() const - { - return CBuildConfig::isCompiledWithFlightSimulatorSupport() && !this->getSimulatorPluginInfo().isUnspecified(); - } + bool IContextSimulator::isSimulatorAvailable() const { return !this->getSimulatorPluginInfo().isUnspecified(); } bool IContextSimulator::isSimulatorSimulating() const {