mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't build Kirigami as a library

Browse source 
Just link it directly into Subsurface-mobile. That's what we already do
with the qmake file for iOS, now the cmake based builds do the same. This
should remove a lot of issues.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-08-18 21:38:13 -07:00
parent 11df8d9a90
commit 7dd8a62ced
3 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packaging/android/build.sh
View file

@ -316,12 +316,6 @@ if [ "$SUBSURFACE_MOBILE" = "ON" ] ; then
pushd $SUBSURFACE_SOURCE
bash ./scripts/mobilecomponents.sh
popd
rm -rf kirigami-build
mkdir -p kirigami-build
pushd kirigami-build
cmake $SUBSURFACE_SOURCE/mobile-widgets/qml/kirigami/ -DSTATIC_LIBRARY=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake
make -j4
popd
fi
if [ ! -z "$SUBSURFACE_MOBILE" ] ; then