diff options
| author |  jan Iversen <jan@casacondor.com> | 2019-12-16 14:44:44 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-12-18 13:29:25 +0900 |
| commit | fa8c7ecc58a945ae6e6d72e0e8b239d0f11c2eb7 (patch) | |
| tree | e355ba72bc345020aa3d91c98ae5d10d7062fca9 | |
| parent | 543e65e9875ae17160d35d8688575eb73b54f9cd (diff) | |
| download | subsurface-fa8c7ecc58a945ae6e6d72e0e8b239d0f11c2eb7.tar.gz | |
build-system: iOS, change location of install-root
move from build-ios/install-root/<arch> to
SSRF_CLONE/install-root/ios/<arch>
move fat libraries, include and bin to SSRF_CLONE/install-root/ios
Call "make" and not "make qmake_all" which is just a FORCE dependency.
Signed-off-by: Jan Iversen <jani@apache.org>
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 20 | ||||
| -rwxr-xr-x | packaging/ios/build.sh | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 8871a9cd8..5eeee4aee 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -132,20 +132,20 @@ RESOURCES += ./qml.qrc \ ../../map-widget/qml/map-widget.qrc \ ./translations.qrc -LIBS += ./install-root/lib/libdivecomputer.a \ - ./install-root/lib/libgit2.a \ - ./install-root/lib/libzip.a \ - ./install-root/lib/libxslt.a \ - ./build-ios/googlemaps-build/libqtgeoservices_googlemaps.a \ +LIBS += ../../../../install-root/ios/lib/libdivecomputer.a \ + ../../../../install-root/ios/lib/libgit2.a \ + ../../../../install-root/ios/lib/libzip.a \ + ../../../../install-root/ios/lib/libxslt.a \ + ../build-ios/googlemaps-build/libqtgeoservices_googlemaps.a \ -liconv \ -lsqlite3 \ -lxml2 -INCLUDEPATH += ./install-root/include/ \ - ./install-root/lib/libzip/include \ - ./install-root/include/libxstl \ - ./install-root/include/libexstl \ - ./install-root/include/openssl \ +INCLUDEPATH += ../../../install-root/ios/include/ \ + ../../../install-root/lib/libzip/include \ + ../../../install-root/ios/include/libxstl \ + ../../../install-root/ios/include/libexstl \ + ../../../install-root/ios/include/openssl \ ../.. \ ../../core \ ../../mobile-widgets/qml/kirigami/src/libkirigami \ diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 0d99fd590..ae687c721 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -93,7 +93,7 @@ for ARCH in $ARCHS; do echo next building for $ARCH - INSTALL_ROOT=$TOP/build-ios/install-root-$ARCH + INSTALL_ROOT=$SSRF_CLONE/install-root/ios/$ARCH mkdir -p $INSTALL_ROOT/lib $INSTALL_ROOT/bin $INSTALL_ROOT/include PKG_CONFIG_LIBDIR=$INSTALL_ROOT/lib/pkgconfig @@ -246,12 +246,12 @@ fi popd # now combine the libraries into fat libraries -rm -rf install-root -cp -a build-ios/install-root-x86_64 install-root +ARCH_ROOT=$SSRF_CLONE/install-root/ios +cp -a $ARCH_ROOT/x86_64/* $ARCH_ROOT if [ "$TARGET" = "iphoneos" ] ; then - pushd install-root/lib + pushd $ARCH_ROOT/lib for LIB in $(find . -type f -name \*.a); do - lipo ../../build-ios/install-root-armv7/lib/$LIB ../../build-ios/install-root-arm64/lib/$LIB ../../build-ios/install-root-x86_64/lib/$LIB -create -output $LIB + lipo $ARCH_ROOT/armv7/lib/$LIB $ARCH_ROOT/arm64/lib/$LIB $ARCH_ROOT/x86_64/lib/$LIB -create -output $LIB done popd fi @@ -285,6 +285,6 @@ for BUILD_NOW in $BUILD_LOOP; do ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../Subsurface-mobile.pro \ -spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG - make qmake_all + make popd done |