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

8
scripts/build.sh
View file

@ -237,14 +237,6 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then
cd $SRC/subsurface
bash ./scripts/mobilecomponents.sh
cd mobile-widgets/qml/kirigami
# hack to work around issue in current kirigami
sed -i.bak -e '/styles\/Desktop\/ContextDrawer.qml/d' kirigami.qrc
sed -i.bak -e '/ecm_create_qm_loader/d' src/CMakeLists.txt
mkdir -p $SRC/kirigami-build
cd $SRC/kirigami-build
cmake $SRC/subsurface/mobile-widgets/qml/kirigami/ -DSTATIC_LIBRARY=ON
make -j4
fi
mkdir -p $SRC/subsurface/$BUILDDIR