diff options
Diffstat (limited to 'scripts/docker/mxe-build-container/Dockerfile-stage2')
-rw-r--r-- | scripts/docker/mxe-build-container/Dockerfile-stage2 | 11 |
1 files changed, 1 insertions, 10 deletions
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 |