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

Make googlemaps compile with Qt5 and Qt6

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2024-08-27 22:32:01 -07:00
parent 1742d6eabb
commit 5d38fd3fe8
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/build.sh
View file

@ -571,7 +571,11 @@ if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] && ( [[ $QT_VE
# build the googlemaps map plugin # build the googlemaps map plugin
cd "$SRC" cd "$SRC"
./${SRC_DIR}/scripts/get-dep-lib.sh single . googlemaps if [ "$BUILD_WITH_QT6" = "1" ] ; then
./${SRC_DIR}/scripts/get-dep-lib.sh -qt6 single . googlemaps
else
./${SRC_DIR}/scripts/get-dep-lib.sh single . googlemaps
fi
pushd googlemaps pushd googlemaps
mkdir -p build mkdir -p build
mkdir -p J10build mkdir -p J10build

21
scripts/get-dep-lib.sh
View file

@ -79,13 +79,17 @@ curl_download_library() {
fi fi
} }
QT6="0"
# deal with all the command line arguments # deal with all the command line arguments
if [ "$1" == "-qt6" ] ; then
shift
QT6="1"
fi
if [ $# -ne 2 ] && [ $# -ne 3 ] ; then if [ $# -ne 2 ] && [ $# -ne 3 ] ; then
echo "wrong number of parameters, format:" echo "wrong number of parameters, format:"
echo "get-dep-lib.sh <platform> <install dir>" echo "get-dep-lib.sh [ -qt6 ] <platform> <install dir>"
echo "get-dep-lib.sh single <install dir> <lib>" echo "get-dep-lib.sh [ -qt6 ] single <install dir> <lib>"
echo "get-dep-lib.sh singleAndroid <install dir> <lib>" echo "get-dep-lib.sh [ -qt6 ] singleAndroid <install dir> <lib>"
echo "where" echo "where"
echo "<platform> is one of scripts, ios or android" echo "<platform> is one of scripts, ios or android"
echo "(the name of the directory where build.sh resides)" echo "(the name of the directory where build.sh resides)"
@ -169,9 +173,12 @@ for package in "${PACKAGES[@]}" ; do
git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
;; ;;
googlemaps) googlemaps)
#git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git if [ "$QT6" = "1" ] ; then
git_checkout_library googlemaps master https://github.com/vladest/googlemaps.git git_checkout_library googlemaps master https://github.com/vladest/googlemaps.git
;; else
git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
fi
;;
hidapi) hidapi)
git_checkout_library hidapi master https://github.com/libusb/hidapi.git git_checkout_library hidapi master https://github.com/libusb/hidapi.git
;; ;;