diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-09-02 14:39:37 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-04 07:46:35 -0700 |
| commit | 2b40e15713e2ccb8963ff8c1eb57f9374e04547d (patch) | |
| tree | 1da96921b5d5bd887a20b83c13f17089fca5445b /packaging/windows | |
| parent | 4bb180b1178d293de4c55099a23d70d385e517d9 (diff) | |
| download | subsurface-2b40e15713e2ccb8963ff8c1eb57f9374e04547d.tar.gz | |
remove Marble from packaging and build scripts
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
please note, that i have no way to test most of the scripts ATM.
Diffstat (limited to 'packaging/windows')
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 4 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index f242a7e44..a1cdde42a 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -31,7 +31,6 @@ if [[ $1 == "Qt5-64" ]] ; then QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \ QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \ QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \ - LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ QMAKE_LIBDIR+=../openssl \ CONFIG+=win64target \ @@ -47,7 +46,6 @@ elif [[ $1 == "Qt5" ]] ; then QMAKE_UIC=/usr/i686-w64-mingw32/bin/qt5/uic \ QMAKE_RCC=/usr/i686-w64-mingw32/bin/qt5/rcc \ LIBDCDEVEL=../libdivecomputer \ - LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ $BASEDIR/../../subsurface.pro @@ -62,7 +60,6 @@ elif [[ $1 == "Qt5debug" ]] ; then QMAKE_CFLAGS_RELEASE='$$QMAKE_CFLAGS_DEBUG -O0 -g' \ QMAKE_CXXFLAGS_RELEASE='$$QMAKE_CXXFLAGS_DEBUG -O0 -g' \ LIBDCDEVEL=../libdivecomputer \ - LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ V=1 \ $BASEDIR/../../subsurface.pro @@ -71,7 +68,6 @@ else mingw32-qmake-qt4 \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ - LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ $BASEDIR/../../subsurface.pro fi diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 6a2bf87f8..44aaf294a 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -331,7 +331,7 @@ i686-w64-mingw32.shared-cmake -DCMAKE_TOOLCHAIN_FILE="$BASEDIR"/"$MXEDIR"/usr/i6 -DMAKENSIS=i686-w64-mingw32.shared-makensis \ -DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/include \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \ - -DNO_MARBLE=ON -DMAKE_TESTS=OFF \ + -DMAKE_TESTS=OFF \ "$BASEDIR"/subsurface make $JOBS "$@" |