Commit Graph

18 Commits

Author SHA1 Message Date
Mat Sutcliffe
82679a3010 Replace qmake variable BLACK_CONFIG with a system based on json files.
The config is loaded from json files by qmake, and we define the qmake
function `swiftConfig` for checking whether a feature is enabled.
This function can be directly used in `buildconfig_gen.cpp.in`,
so the trick with C++ comment tokens in variables is not needed.
2019-02-22 20:23:25 +00:00
Klaus Basan
94e06e23e9 Using P3D 4.2 sinConnect x64 2018-10-05 17:39:57 +02:00
Roland Winklmeier
b16af78142 Load SimConnect dynamically at runtime.
Previously the FSX/P3D driver tried to link a very specific SimConnect version
from the Windows Assembly cache. This caused issues with machines
which did not have this specific version of SimConnect in the assembly
cache since drivers refused to load without much information. Having a different
version of SimConnect in the assembly cache or even in the bin folder did
not help.
To fix this problem, SimConnect is now loaded and resolved manually at
runtime. This allows to try loading different versions from the assembly
cache or prefer to load the shipped one.
For this, the manifests are linked into the binary's resource section and
activated manually before loading. This has the positive effect, that
loading errors can be handled by code instead of raising a cryptic error and
aborting.
2018-07-12 18:29:45 +02:00
Klaus Basan
f728efb3be Ref T270, Ref T275 FSX/P3D moved the common parts of the .pro files into .pri files and included those
Remark: See also https://swift-project.slack.com/archives/G7GD2UP9C/p1528277800000196
2018-06-13 14:00:07 +02:00
Klaus Basan
78747782e4 Ref T270, Ref T275 FSX/P3D .pro files adjusted 2018-06-13 14:00:06 +02:00
Roland Winklmeier
4aaccb44c3 Cleanup the enabled modules in all sub projects
Most modules were just enabled to add include path for dependent headers
2018-06-02 02:08:46 +02:00
Klaus Basan
2ae8f5b03f Ref T270, added CSimulatorPluginCommon as base class in driver project
* unlike BlackCore::CSimulatorCommon we can add also UI aspects here
* used by emulated driver, XP and the FS series
2018-05-18 00:25:11 +02:00
Klaus Basan
6061a61d50 Ref T260, changed elevation handling in provider, simulator and FSX common driver
* split functions, added findClosestElevationWithinRangeOrRequest
* obtain elevation ids (separate ids are easier to track)
* also added experimental "physicallyAddAITerrainProbe" (FSX) for the FSX elevation probing
* callback / signal when requested elevation is received (async)
2018-05-08 16:06:35 +02:00
Klaus Basan
d118ea402f Ref T232 clear remote aircraft data once network disconnects
* blackconfig in .pro
* verify function to detect dangling states
* clear remote data when disconnected from network
* there was one problem that the data where not correctly cleaned up and hence new aircraft where not added again after a disconnect/reconnect from network
* it is not yet clear why data happens (dangling data), that is what the debugVerify function is for
2018-01-30 20:31:11 +01:00
Klaus Basan
c5f57a6bd1 Ref T197, P3D x86 build
* pro files
* description
2017-12-21 19:46:14 +01:00
Klaus Basan
6b3cdf52ee Ref T180, adjusted FSX/P3D includes
* the fix header belongs into fsxcommon (not fsx) dir
* P3D is purely P3D, we do not build a P3D x86 driver
2017-11-05 20:02:03 +01:00
Klaus Basan
41f5999094 Ref T118, changed to P3D v4.1 2017-10-31 15:39:10 +01:00
Roland Winklmeier
3481949a46 Add missing library dependency for P3D plugin
Summary:
There were a couple of unresolved symbols when building swift with 64 bit
MSVC. Those are resolved by linking against Advapi32.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D37
2017-09-24 19:50:44 +01:00
Mathew Sutcliffe
1400f38aa9 Add missing PRE_TARGETDEPS in simulator plugin projects
Summary:
This fixes issue reported by Klaus in Slack:
> when I change something in the plugin driver, I always have to rebuild the plugins before I can debug again.

Also refactored `libraries.pri` to remove duplication.

Reviewers: #swift_pilot_client, rwinklmeier

Reviewed By: #swift_pilot_client, rwinklmeier

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D31
2017-09-24 19:49:18 +01:00
Roland Winklmeier
984b30aef3 Enable P3D-v4 64 bit build
Summary:
This commit enables P3D-v4 for 64 bit including all dependent libraries.
Those binaries are not yet installed, since they are considered
experimental.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Differential Revision: https://dev.swift-project.org/D30
2017-09-24 19:49:16 +01:00
Roland Winklmeier
5a40e86ecf Add 32 and 64 bit FSUIPC library projects
Summary:
So far we were linking against the prebuilt FSUIPC user library,
compiled with VS2010 many years ago. The source of this user library is
part of the FSUIPC SDK, so we can benefit from modern compilers and
include it into our source tree.
This version contains some very small wide char fixes compared to the
official FSUIPC SDK source.
It also includes the new 64 bit version.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Differential Revision: https://dev.swift-project.org/D29
2017-06-27 13:37:52 +02:00
Roland Winklmeier
79556260bd Remove QtConcurrent from list of Qt modules
Summary:
QtConcurrent isn't used any longer in swift code, so we can remove it
from the list of enabled modules. Disabling it causes the QtConcurrent
header path to be removed from the include paths and we no longer
unnecessarily link against it.

Reviewers: msutcliffe

Reviewed By: msutcliffe

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D25
2017-06-09 12:29:59 +02:00
Klaus Basan
d280141563 refs #891, P3D driver / config 2017-04-17 23:57:17 +01:00