mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOS build: compile kirigami plugin

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-08-14 15:48:48 -07:00
parent c840ab4332
commit d408939076
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
View file

@ -112,6 +112,7 @@ LIBS += ../install-root/lib/libcrypto.a \
../install-root/lib/libxml2.a \ ../install-root/lib/libxml2.a \
../install-root/lib/libssh2.a \ ../install-root/lib/libssh2.a \
../install-root/lib/libssl.a \ ../install-root/lib/libssl.a \
../install-root/lib/libkirigamiplugin.a \
-liconv -liconv
INCLUDEPATH += ../install-root/include/ \ INCLUDEPATH += ../install-root/include/ \

21
packaging/ios/build.sh
View file

@ -37,6 +37,10 @@ cat Info.plist.in | sed "s/@MOBILE_VERSION@/$MOBILEVERSION/;s/@CANONICAL_VERSION
# Build Subsurface-mobile by default # Build Subsurface-mobile by default
SUBSURFACE_MOBILE=1 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) # 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 # 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 # build libdivecomputer
if [ ! -d libdivecomputer ] ; then if [ ! -d libdivecomputer ] ; then
git clone -b Subsurface-branch git://subsurface-divelog.org/libdc libdivecomputer git clone -b Subsurface-branch git://subsurface-divelog.org/libdc libdivecomputer
@ -355,10 +373,11 @@ echo next building for $ARCH
done done
# now combine the arm libraries into fat libraries # now combine the arm libraries into fat libraries
rm -rf install-root
cp -a install-root-arm64 install-root cp -a install-root-arm64 install-root
pushd install-root/lib pushd install-root/lib
for LIB in $(find . -type f -name \*.a); do 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 done
popd popd