From 6019688b98979c04c162b06326f970e24e7e8525 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 8 May 2018 18:18:23 +0200 Subject: iOS: removed local build of libxml2 script/build.sh uses the builtin libxml2 and do not build locally, updated build.sh and Subsurface-mobile.pro to to the same. sadly enough xslt is not distributed for iOS so it must be built. Apart from simplifying the script it saves build time Signed-off-by: Jan Iversen --- packaging/ios/Subsurface-mobile/Subsurface-mobile.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packaging/ios/Subsurface-mobile/Subsurface-mobile.pro') diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro index bfe3bab16..9d129c493 100644 --- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro @@ -109,20 +109,20 @@ LIBS += ../install-root/lib/libdivecomputer.a \ ../install-root/lib/libgit2.a \ ../install-root/lib/libzip.a \ ../install-root/lib/libxslt.a \ - ../install-root/lib/libxml2.a \ ../googlemaps-build/libqtgeoservices_googlemaps.a \ -liconv \ - -lsqlite3 + -lsqlite3 \ + -lxml2 INCLUDEPATH += ../install-root/include/ \ ../install-root/lib/libzip/include \ - ../install-root/include/libxml2 \ ../install-root/include/libxstl \ ../install-root/include/libexstl \ ../install-root/include/openssl \ ../../.. \ ../../../core \ - ../../../mobile-widgets/qml/kirigami/src/libkirigami + ../../../mobile-widgets/qml/kirigami/src/libkirigami \ + /usr/include/libxml2 HEADERS += \ ../../../core/libdivecomputer.h \ -- cgit v1.2.3-70-g09d2