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 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue