diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-09-04 07:54:22 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-09-04 07:54:22 -0700 |
| commit | 055276f1bafa759159b47710b3865ad48c1be8fc (patch) | |
| tree | b7bd17fc4b81b69c1b2a31b1e8cfd0dcf8aa7910 /packaging | |
| parent | 830d9163dc34b48cd5a14ee231e6b9cf3a916bd7 (diff) | |
| download | subsurface-055276f1bafa759159b47710b3865ad48c1be8fc.tar.gz | |
iOS build: re-enable building libraries for the simulator
We now build Kirigami as part of Subsurface-mobile itself, so the simulator
builds work again.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/ios/build.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index b3b63bfc8..c3af0aa1d 100644 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -333,16 +333,6 @@ echo next building for $ARCH # fi # -# build kirigami -# if [ ! "$ARCH" = "x86_64" ] ; then -# mkdir -p kirigami-build-$ARCH -# pushd kirigami-build-$ARCH -# ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${SUBSURFACE_SOURCE}/mobile-widgets/qml/kirigami/kirigami.pro -r -spec macx-ios-clang CONFIG+=iphoneos CONFIG+=release QMAKE_IOS_DEVICE_ARCHS=$ARCH -# make -# cp org/kde/libkirigamiplugin.a ${PREFIX}/lib -# popd -# fi - # build libdivecomputer if [ ! -d libdivecomputer ] ; then git clone -b Subsurface-branch git://subsurface-divelog.org/libdc libdivecomputer @@ -373,7 +363,7 @@ rm -rf install-root cp -a install-root-arm64 install-root pushd install-root/lib for LIB in $(find . -type f -name \*.a); do - lipo ../../install-root-armv7/lib/$LIB ../../install-root-arm64/lib/$LIB -create -output $LIB + lipo ../../install-root-armv7/lib/$LIB ../../install-root-arm64/lib/$LIB ../../install-root-x86_64/lib/$LIB -create -output $LIB done popd |