diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 15:48:48 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 15:48:48 -0700 |
| commit | d40893907691a4a7519741669df7294db9c60419 (patch) | |
| tree | 5ebf7cc74322d83f21887c64c66c0bf587b67f7b /packaging/ios | |
| parent | c840ab43323f351043e7f74502f933ae46d3ea9e (diff) | |
| download | subsurface-d40893907691a4a7519741669df7294db9c60419.tar.gz | |
IOS build: compile kirigami plugin
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/ios')
| -rw-r--r-- | packaging/ios/Subsurface-mobile/Subsurface-mobile.pro | 1 | ||||
| -rw-r--r-- | packaging/ios/build.sh | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro index 4afc35383..53af7e379 100644 --- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro @@ -112,6 +112,7 @@ LIBS += ../install-root/lib/libcrypto.a \ ../install-root/lib/libxml2.a \ ../install-root/lib/libssh2.a \ ../install-root/lib/libssl.a \ + ../install-root/lib/libkirigamiplugin.a \ -liconv INCLUDEPATH += ../install-root/include/ \ diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 2a8709a33..07828eaac 100644 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -37,6 +37,10 @@ cat Info.plist.in | sed "s/@MOBILE_VERSION@/$MOBILEVERSION/;s/@CANONICAL_VERSION # Build Subsurface-mobile by default SUBSURFACE_MOBILE=1 +pushd ${SUBSURFACE_SOURCE} +bash scripts/mobilecomponents.sh +popd + # now build all the dependencies for the three relevant architectures (x86_64 is for the simulator) @@ -329,6 +333,20 @@ echo next building for $ARCH # fi # +# build kirigami + if [ ! "$ARCH" = "x86_64" ] ; then + pushd ${SUBSURFACE_SOURCE}/mobile-widgets/qml/kirigami + sed -i.bak -e '/styles\/Desktop\/ContextDrawer.qml/d' kirigami.qrc + sed -i.bak -e '/ecm_create_qm_loader/d' src/CMakeLists.txt + popd + 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 @@ -355,10 +373,11 @@ echo next building for $ARCH done # now combine the arm libraries into fat libraries +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 ../../install-root-x86_64/lib/$LIB -create -output $LIB + lipo ../../install-root-armv7/lib/$LIB ../../install-root-arm64/lib/$LIB -create -output $LIB done popd |