diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-06 22:37:35 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-07 14:00:45 -0700 |
| commit | f05d917a37ff66bb6251fe9fd0fec4dc3d07aaa6 (patch) | |
| tree | 6043f0a31d21484b84f91269df42feae67644b0b /packaging/windows | |
| parent | 450f654063cbbffe7b58e0b785ef8970a0be41ea (diff) | |
| download | subsurface-f05d917a37ff66bb6251fe9fd0fec4dc3d07aaa6.tar.gz | |
MXE: use libgit2 from MXE
MXE has had a new enough libgit2 for a while now. No reason anymore to
build our own.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/windows')
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 4271e744a..0927f662a 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -42,7 +42,6 @@ # ~/src/mxe <- MXE git with Qt5, automake (see above) # /grantlee <- Grantlee 5.0.0 sources from git # /subsurface <- current subsurface git -# /libgit2 <- libgit2 0.23.1 or similar # /googlemaps <- Google Maps plugin for QtLocation from git # # ~/src/win32 <- build directory @@ -142,22 +141,6 @@ if [[ ! -d grantlee || -f build.grantlee ]] ; then make install fi -# libgit2: - -cd "$BUILDDIR" -if [[ ! -d libgit2 || -f build.libgit2 ]] ; then - rm -f build.libgit2 - mkdir -p libgit2 - cd libgit2 - i686-w64-mingw32.shared-cmake \ - -DBUILD_CLAR=OFF -DTHREADSAFE=ON \ - -DCMAKE_BUILD_TYPE=$RELEASE \ - -DDLLTOOL="$BASEDIR"/"$MXEDIR"/usr/bin/i686-w64-mingw32.shared-dlltool \ - "$BASEDIR"/libgit2 - make $JOBS - make install -fi - # libdivecomputer # ensure the git submodule is present and the autotools are set up @@ -286,6 +269,7 @@ i686-w64-mingw32.shared-cmake \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \ -DMAKE_TESTS=OFF \ -DBTSUPPORT=ON -DBLESUPPORT=ON \ + -DLIBGIT2_FROM_PKGCONFIG=ON \ "$BASEDIR"/subsurface make $JOBS "$@" |