diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-14 22:34:15 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-15 13:33:00 -0800 |
| commit | 7aab63558525a8c6e17d39bdc4e3691baa02266e (patch) | |
| tree | 5f875366977b81df358e258844eac3d7c579d0f7 /packaging | |
| parent | c8be04edad5e5f8cc91bae22d599ffdda1042376 (diff) | |
| download | subsurface-7aab63558525a8c6e17d39bdc4e3691baa02266e.tar.gz | |
Remove support for older libgit2 - we now require 0.23 or later
Also fixes a capitalization error that prevented finding libssh2 in some
circumstances. And adds a missing include when building with libzip on Mac.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 1 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index b03bfef19..a7771bc1a 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -294,7 +294,6 @@ cmake $MOBILE_CMAKE \ -DFORCE_LIBSSH=ON \ -DLIBDC_FROM_PKGCONFIG=ON \ -DLIBGIT2_FROM_PKGCONFIG=ON \ - -DUSE_LIBGIT23_API=ON \ -DNO_MARBLE=ON \ -DNO_PRINTING=ON \ -DNO_USERMANUAL=ON \ diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 16440560e..ea34b6c66 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -346,7 +346,6 @@ else -DCMAKE_BUILD_TYPE=$RELEASE \ -DQT_TRANSLATION_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/translations \ -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.dll.a \ -DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \ |