diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-26 14:27:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-10-26 14:27:16 -0700 |
| commit | 47c7958ed3545a4c1dd316b0404cc37f6cd72aef (patch) | |
| tree | 52b791f1beaa4d0b75886b3e6b545fb3b82911fc | |
| parent | c6ec742d113f609604fc5fb76dcb2a214a50f3d8 (diff) | |
| download | subsurface-47c7958ed3545a4c1dd316b0404cc37f6cd72aef.tar.gz | |
Build Windows installer with shared libdivecomputer
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>
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 1f0898b02..4436b6f77 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -265,7 +265,7 @@ if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then cd libdivecomputer "$BASEDIR"/libdivecomputer/configure --host=i686-w64-mingw32.shared \ - --enable-static --disable-shared \ + --enable-shared \ --prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared make $JOBS make install @@ -348,7 +348,7 @@ else -DMAKENSIS=i686-w64-mingw32.shared-makensis \ -DUSE_LIBGIT23_API=1 \ -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_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \ "$BASEDIR"/subsurface |