mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

MXE: use libgit2 from MXE

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2018-10-06 22:37:35 -07:00
parent 450f654063
commit f05d917a37
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packaging/windows/mxe-based-build.sh
View file

@ -42,7 +42,6 @@
# ~/src/mxe <- MXE git with Qt5, automake (see above) # ~/src/mxe <- MXE git with Qt5, automake (see above)
# /grantlee <- Grantlee 5.0.0 sources from git # /grantlee <- Grantlee 5.0.0 sources from git
# /subsurface <- current subsurface git # /subsurface <- current subsurface git
# /libgit2 <- libgit2 0.23.1 or similar
# /googlemaps <- Google Maps plugin for QtLocation from git # /googlemaps <- Google Maps plugin for QtLocation from git
# #
# ~/src/win32 <- build directory # ~/src/win32 <- build directory
@ -142,22 +141,6 @@ if [[ ! -d grantlee || -f build.grantlee ]] ; then
make install make install
fi 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 # libdivecomputer
# ensure the git submodule is present and the autotools are set up # 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 \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \
-DMAKE_TESTS=OFF \ -DMAKE_TESTS=OFF \
-DBTSUPPORT=ON -DBLESUPPORT=ON \ -DBTSUPPORT=ON -DBLESUPPORT=ON \
-DLIBGIT2_FROM_PKGCONFIG=ON \
"$BASEDIR"/subsurface "$BASEDIR"/subsurface
make $JOBS "$@" make $JOBS "$@"