diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 07:31:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 07:31:56 -0700 |
| commit | cd8e1eb15aa23e760a2e7a952652e92433f43a6c (patch) | |
| tree | 9d23eb82b9b089477459742254bfe195108d626f /packaging | |
| parent | 5f11c94f02eca651e07f5a0c2cc4e55dcbf2df0b (diff) | |
| download | subsurface-cd8e1eb15aa23e760a2e7a952652e92433f43a6c.tar.gz | |
Revert "Windows build: Changesto build using mxebased hidapi,libusb and grantlee"
This reverts commit 60e63afb8219ca22001a4d1c5c0e6a7e27af89d5.
I merged this to early without paying attention to the fact that this
needed an updated build container as well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 494d95d20..b5e99926c 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -20,15 +20,14 @@ # MXE_TARGETS := i686-w64-mingw32.shared.posix.dw2 # # # Uncomment the next line if you want to do debug builds later -# # note this currently doesn't build on mxe version @180304a # # qtbase_CONFIGURE_OPTS=-debug-and-release #--- # (documenting this in comments is hard... you need to remove # the first '#' of course) # # now you can start the build -# look at the setting.mk ffrom scripts/docker/mxe-build-container/settings.mk -# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis libgit2 qtwebkit hidapi +# +# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis # # (if you intend to build Subsurface without user space FTDI support # you can drop libftdi1 from that list and start this script with @@ -45,8 +44,10 @@ # Something like this: # # ~/src/mxe <- MXE git with Qt5, automake (see above) +# /grantlee <- Grantlee 5.0.0 sources from git # /subsurface <- current subsurface git # /googlemaps <- Google Maps plugin for QtLocation from git +# /hidapi <- HIDAPI library for libdivecomputer # # ~/src/win32 <- build directory # @@ -137,6 +138,43 @@ 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 # ensure the git submodule is present and the autotools are set up |