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 /packaging/windows/mxe-based-build.sh | |
| 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 'packaging/windows/mxe-based-build.sh')
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index b5e99926c..f78c3d0d8 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -138,41 +138,6 @@ else touch Release fi -# grantlee - -cd "$BUILDDIR" -if [[ ! -d grantlee || -f build.grantlee ]] ; then - rm -f build.grantlee - mkdir -p grantlee - cd grantlee - "$MXEBUILDTYPE"-cmake \ - -DCMAKE_BUILD_TYPE=$RELEASE \ - -DBUILD_TESTS=OFF \ - "$BASEDIR"/grantlee - - make $JOBS - make install -fi - -# hidapi for libdivecomputer (if available) - -if [[ -d "$BASEDIR"/hidapi ]] ; then - cd "$BUILDDIR" - if [[ ! -d hidapi || -f build.hidapi ]] ; then - rm -f build.hidapi - mkdir -p hidapi - pushd "$BASEDIR"/hidapi - bash ./bootstrap - popd - cd hidapi - "$BASEDIR"/hidapi/configure \ - CC="$MXEBUILDTYPE"-gcc \ - --host="$MXEBUILDTYPE" \ - --prefix="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE" - make $JOBS - make install - fi -fi # libdivecomputer @@ -284,7 +249,8 @@ done # for some reason we aren't installing Qt5Xml.dll and Qt5Location.dll # I need to figure out why and fix that, but for now just manually copy that as well EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \ -$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Location$DLL_SUFFIX.dll" +$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Location$DLL_SUFFIX.dll \ +$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5QmlWorkerScript$DLL_SUFFIX.dll" for f in $EXTRA_MANUAL_DEPENDENCIES do |