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/smtk2ssrf-mxe-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/smtk2ssrf-mxe-build.sh')
| -rwxr-xr-x | packaging/windows/smtk2ssrf-mxe-build.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/packaging/windows/smtk2ssrf-mxe-build.sh b/packaging/windows/smtk2ssrf-mxe-build.sh index c3d8f7ac0..170394493 100755 --- a/packaging/windows/smtk2ssrf-mxe-build.sh +++ b/packaging/windows/smtk2ssrf-mxe-build.sh @@ -142,32 +142,6 @@ export PKG_CONFIG_PATH_i686_w64_mingw32_shared="$BASEDIR/mxe/usr/i686-w64-mingw3 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH_i686_w64_mingw32_static":"$PKG_CONFIG_PATH_i686_w64_mingw32_shared" # -# mdbtools -# build from sources. If build fails, fallback to prebuilt mxe binaries. -# -echo -e "$BLUE---> Building mdbtools ... $DEFAULT " -mkdir -p --verbose "$BASEDIR"/mxe/usr/i686-w64-mingw32.static/include -mkdir -p --verbose "$BASEDIR"/mxe/usr/i686-w64-mingw32.static/lib -cd "$BUILDDIR" -[[ -d mdbtools ]] && rm -rf mdbtools -mkdir -p mdbtools -cd mdbtools -if [ ! -f "$BASEDIR"/mdbtools/configure ] ; then - ( cd "$BASEDIR"/mdbtools - autoreconf -v -f -i ) -fi -"$BASEDIR"/mdbtools/configure CC=i686-w64-mingw32.static-gcc \ - --host=i686-w64-mingw32.static \ - --prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.static \ - --enable-shared=no \ - --disable-man \ - --disable-gmdb2 -# hack to make mdbtools build outsource -ln -vs "$BUILDDIR"/mdbtools/include/mdbver.h "$BASEDIR"/mdbtools/include/mdbver.h - -make $JOBS >/dev/null && make install || \ - echo -e "$RED---> Building mdbtools failed ...$LIGHT_GRAY Trying to build with precompiled mxe binaries$DEFAULT" - # Subsurface # if [ "$AUTO" = "false" ]; then |