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

libdc: update the MXE build script for submodule

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-03 12:53:56 -08:00
parent 3368b89336
commit 25041be08c
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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
# /libdivecomputer <- appropriate libdc/Subsurface-branch branch
# /libgit2 <- libgit2 0.23.1 or similar # /libgit2 <- libgit2 0.23.1 or similar
# /googlemaps <- Google Maps plugin for QtLocation from git # /googlemaps <- Google Maps plugin for QtLocation from git
# #
@ -158,22 +157,19 @@ if [[ ! -d libgit2 || -f build.libgit2 ]] ; then
fi fi
# libdivecomputer # libdivecomputer
#
# this one is special because we want to make sure it's in sync cd "$BASEDIR"/subsurface
# with the Linux builds, but we don't want the autoconf files cluttering if [ ! -d libdivecomputer/src ] ; then
# the original source directory... so the "$BASEDIR"/libdivecomputer is git submodule update --recursive
# a local clone of the "real" libdivecomputer directory fi
cd "$BUILDDIR" cd "$BUILDDIR"
if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then
rm -f build.libdivecomputer rm -f build.libdivecomputer
cd "$BASEDIR"/libdivecomputer
git pull
cd "$BUILDDIR"
mkdir -p libdivecomputer mkdir -p libdivecomputer
cd libdivecomputer cd libdivecomputer
"$BASEDIR"/libdivecomputer/configure \ "$BASEDIR"/subsurface/libdivecomputer/configure \
CC=i686-w64-mingw32.shared-gcc \ CC=i686-w64-mingw32.shared-gcc \
--host=i686-w64-mingw32.shared \ --host=i686-w64-mingw32.shared \
--enable-shared \ --enable-shared \

3
scripts/windows/before_install.sh
View file

@ -40,6 +40,9 @@ CURRENT_LIBGIT2="v0.26.0"
echo "Get libdivecomputer" echo "Get libdivecomputer"
cd ${TRAVIS_BUILD_DIR} cd ${TRAVIS_BUILD_DIR}
git submodule update --recursive git submodule update --recursive
cd libdivecomputer
autoreconf --install
autoreconf --install
echo "Get libusb" echo "Get libusb"
cd ${TRAVIS_BUILD_DIR}/.. cd ${TRAVIS_BUILD_DIR}/..