From 055276f1bafa759159b47710b3865ad48c1be8fc Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 4 Sep 2016 07:54:22 -0700
Subject: 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>
---
 packaging/ios/build.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'packaging/ios')

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
 
-- 
cgit v1.2.3-70-g09d2