diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-16 16:39:30 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | e3a83dcc90d4aa490dab45272edb1d87150480b0 (patch) | |
| tree | 38cf378f9b85ae3a99f9f8f76da536d58eb92cf1 /packaging/ios | |
| parent | 856a0d36f5d3b0faf68b5fd46d027bb6093d31ff (diff) | |
| download | subsurface-e3a83dcc90d4aa490dab45272edb1d87150480b0.tar.gz | |
build-system/iOS: remove outdated build-ios directories
The places we build things are still rather inconsistent for historic reasons -
this definitely deserves some more cleaning up.
The top level build-ios dir was completely unused, and the build location for
the googlemaps plugin was inconsistent with all of the other build dirs.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/ios')
| -rwxr-xr-x | packaging/ios/build.sh | 7 |
1 files changed, 2 insertions, 5 deletions
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 |