diff options
| author |  Paul Buxton <paulbuxton.mail@googlemail.com> | 2020-05-30 12:21:22 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-06-25 11:00:51 -0700 |
| commit | a753845d5acd6d25ff74dc969a9ea6307d8abe6a (patch) | |
| tree | 04ed77091a154c90f99a3c9903fa293dbddb451a /scripts/docker/mxe-build-container/qtconnectivity-1.patch | |
| parent | edc1499e9153907c2901611516a0592db3f56e56 (diff) | |
| download | subsurface-a753845d5acd6d25ff74dc969a9ea6307d8abe6a.tar.gz | |
build-system/MXE: build with more up to date MXE tools.
- use hidapi grantlee and mdbtools from MXE
- update MXE version to use QT 5.15, and pull in libzstd and CMake 3.17.3
- fix linking of winmm on windows build with new mxe
- add some instructions on building the container
- add some new dependancies from QT 5.15 to the packaging
- add a patch to MXE to Build qtconnectivity with native-win32-bluetooth
[Dirk Hohndel: small refactor]
Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/mxe-build-container/qtconnectivity-1.patch')
| -rw-r--r-- | scripts/docker/mxe-build-container/qtconnectivity-1.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/docker/mxe-build-container/qtconnectivity-1.patch b/scripts/docker/mxe-build-container/qtconnectivity-1.patch new file mode 100644 index 000000000..fa43ff724 --- /dev/null +++ b/scripts/docker/mxe-build-container/qtconnectivity-1.patch @@ -0,0 +1,12 @@ +diff --git a/src/bluetooth/configure.json b/src/bluetooth/configure.json +index 3bd95903..0d41d88f 100644 +--- a/src/bluetooth/configure.json ++++ b/src/bluetooth/configure.json +@@ -63,6 +63,7 @@ + "purpose": "Uses the native Win32 Bluetooth backend.", + "section": "Qt Bluetooth", + "autoDetect": false, ++ "enable": true, + "output": [ "publicFeature", "feature" ] + }, + "winrt_bt": { |