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: re-enable building libraries for the simulator

Browse source 
We now build Kirigami as part of Subsurface-mobile itself, so the simulator
builds work again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-09-04 07:54:22 -07:00
parent 830d9163dc
commit 055276f1ba
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packaging/ios/build.sh
View file

@ -333,16 +333,6 @@ echo next building for $ARCH
# fi # 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 # 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
@ -373,7 +363,7 @@ 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 -create -output $LIB lipo ../../install-root-armv7/lib/$LIB ../../install-root-arm64/lib/$LIB ../../install-root-x86_64/lib/$LIB -create -output $LIB
done done
popd popd