mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
543e65e987
commit
fa8c7ecc58
2 changed files with 16 additions and 16 deletions
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue