From 7dd8a62ceddbb2205bd41260964f3450e72fccab Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 18 Aug 2016 21:38:13 -0700 Subject: Don't build Kirigami as a library 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 --- scripts/build.sh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 9f785db1a..873bba789 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -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 -- cgit v1.2.3-70-g09d2