diff options
| -rw-r--r-- | Subsurface-mobile.pro | 2 | ||||
| -rwxr-xr-x | packaging/ios/build.sh | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index bf5d73f41..2da1e5703 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -373,7 +373,7 @@ ios { ../install-root/ios/lib/libzip.a \ ../install-root/ios/lib/libxslt.a \ ../install-root/ios/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \ - ../googlemaps/build-ios/libqtgeoservices_googlemaps.a \ + ../googlemaps-build/libqtgeoservices_googlemaps.a \ -liconv \ -lsqlite3 \ -lxml2 diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 8b6c45400..b4706770b 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -45,9 +45,6 @@ cd .. export PARENT_DIR=$PWD popd -# prepare build dir -mkdir -p build-ios - IOS_QT=~/Qt QT_VERSION=$(cd "$IOS_QT"; ls -d [1-9]* | awk -F. '{ printf("%02d.%02d.%02d\n", $1,$2,$3); }' | sort -n | tail -1 | sed -e 's/\.0/\./g;s/^0//') @@ -249,8 +246,8 @@ for ARCH in $ARCHS; do done # build googlemaps -mkdir -p "$PARENT_DIR"/googlemaps/build-ios -pushd "$PARENT_DIR"/googlemaps/build-ios +mkdir -p "$PARENT_DIR"/googlemaps-build +pushd "$PARENT_DIR"/googlemaps-build "$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$PARENT_DIR"/googlemaps/googlemaps.pro CONFIG+=release make if [ "$DEBUGRELEASE" != "Release" ] ; then |