mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 19:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix iOS simulator builds

Browse source 
With this hopefully the GitHub Action will pass again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2024-01-02 19:46:36 -08:00
parent b67aebd462
commit 60f1deb116
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Subsurface-mobile.pro
View file

@ -418,12 +418,13 @@ ios {
Q_ENABLE_BITCODE.name = ENABLE_BITCODE Q_ENABLE_BITCODE.name = ENABLE_BITCODE
Q_ENABLE_BITCODE.value = NO Q_ENABLE_BITCODE.value = NO
QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
ARCH_PATH = ../install-root/ios/$${ARCH}
LIBS += ../install-root/ios/$${QT_ARCH}/lib/libdivecomputer.a \ LIBS += $${ARCH_PATH}/lib/libdivecomputer.a \
../install-root/ios/$${QT_ARCH}/lib/libgit2.a \ $${ARCH_PATH}/lib/libgit2.a \
../install-root/ios/$${QT_ARCH}/lib/libzip.a \ $${ARCH_PATH}/lib/libzip.a \
../install-root/ios/$${QT_ARCH}/lib/libxslt.a \ $${ARCH_PATH}/lib/libxslt.a \
../install-root/ios/$${QT_ARCH}/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \ $${ARCH_PATH}/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \
../googlemaps-build/libqtgeoservices_googlemaps.a \ ../googlemaps-build/libqtgeoservices_googlemaps.a \
-liconv \ -liconv \
-lsqlite3 \ -lsqlite3 \
@ -431,14 +432,13 @@ ios {
LIBS += -framework MessageUI LIBS += -framework MessageUI
INCLUDEPATH += ../install-root/ios/$${QT_ARCH}/include/ \ INCLUDEPATH += $${ARCH_PATH}/include/ \
../install-root/ios/$${QT_ARCH}/include \ $${ARCH_PATH}/include/libxstl \
../install-root/ios/$${QT_ARCH}/include/libxstl \ $${ARCH_PATH}/include/libexstl \
../install-root/ios/$${QT_ARCH}/include/libexstl \ $${ARCH_PATH}/include/openssl \
../install-root/ios/$${QT_ARCH}/include/openssl \
. \ . \
./core \ ./core \
./mobile-widgets/3rdparty/kirigami/src/libkirigami \ ./mobile-widgets/3rdparty/kirigami/src/libkirigami \
../install-root/ios/$${QT_ARCH}/include/libxml2 $${ARCH_PATH}/include/libxml2
} }

6
packaging/ios/build.sh
View file

@ -346,9 +346,11 @@ for BUILD_NOW in $BUILD_LOOP; do
rm -f ssrf-version.h rm -f ssrf-version.h
ln -s "$SUBSURFACE_SOURCE"/ssrf-version.h . ln -s "$SUBSURFACE_SOURCE"/ssrf-version.h .
# shellcheck disable=SC2086 # shellcheck disable=SC2086
"$QMAKE" $QMAKEARG "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro \ "$QMAKE" $QMAKEARG ARCH=$ARCH "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro \
-spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG -spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG
make -j # it appears that a first make fails with a missing generated file, which a second
# invocation of make will happily build
make || make
popd popd
done done