From a753845d5acd6d25ff74dc969a9ea6307d8abe6a Mon Sep 17 00:00:00 2001 From: Paul Buxton Date: Sat, 30 May 2020 12:21:22 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- scripts/docker/mxe-build-container/Dockerfile-stage2 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'scripts/docker/mxe-build-container/Dockerfile-stage2') diff --git a/scripts/docker/mxe-build-container/Dockerfile-stage2 b/scripts/docker/mxe-build-container/Dockerfile-stage2 index 55fa3480c..d8760f723 100644 --- a/scripts/docker/mxe-build-container/Dockerfile-stage2 +++ b/scripts/docker/mxe-build-container/Dockerfile-stage2 @@ -9,14 +9,5 @@ ADD settings-stage2.mk /win/mxe/settings.mk RUN cd /win/mxe ; \ make -j 2 2>&1 | tee build.log ; RUN cd /win/mxe ; \ - make MXE_TARGETS=i686-w64-mingw32.static glib -j 6 2>&1 | tee -a build.log ; + make MXE_TARGETS=i686-w64-mingw32.static glib mdbtools -j 6 2>&1 | tee -a build.log ; -# manually build the Win BLE version of QtConnectivity (we can drop this with Qt 5.14) -RUN cd /win/mxe ; \ - mkdir -p neolit ; cd neolit ; git clone -b wip/win git://github.com/qt/qtconnectivity ; \ - sed -i 's/SetupAPI.h/setupapi.h/' qtconnectivity/src/bluetooth/qlowenergycontroller_win.cpp -RUN cd /win/mxe/neolit/qtconnectivity ; \ - PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /win/mxe/usr/i686-w64-mingw32.shared/qt5/bin/qmake qtconnectivity.pro ; \ - PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make -j 6 ; \ - PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make install ; -RUN rm -rf /win/mxe/pkg -- cgit v1.2.3-70-g09d2