mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build Windows installer with shared libdivecomputer

Browse source 
Since we ship it all in one piece there is no reason to use a static
libdivecomputer (like there is on Linux). This allows us to give the user
a different libdivecomputer.dll for testing when tracking down a bug.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-26 14:27:16 -07:00
parent c6ec742d11
commit 47c7958ed3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then
cd libdivecomputer cd libdivecomputer
"$BASEDIR"/libdivecomputer/configure --host=i686-w64-mingw32.shared \ "$BASEDIR"/libdivecomputer/configure --host=i686-w64-mingw32.shared \
--enable-static --disable-shared \ --enable-shared \
--prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared --prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared
make $JOBS make $JOBS
make install make install
@ -348,7 +348,7 @@ else
-DMAKENSIS=i686-w64-mingw32.shared-makensis \ -DMAKENSIS=i686-w64-mingw32.shared-makensis \
-DUSE_LIBGIT23_API=1 \ -DUSE_LIBGIT23_API=1 \
-DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \ -DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
-DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libdivecomputer.a \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll \
-DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \ -DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
-DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \ -DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
"$BASEDIR"/subsurface "$BASEDIR"/subsurface