diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-18 21:38:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-08-18 21:38:13 -0700 |
| commit | 7dd8a62ceddbb2205bd41260964f3450e72fccab (patch) | |
| tree | 62c3c06cbe1bf3a5ae37122f55a273e4fa741c0b /scripts/build.sh | |
| parent | 11df8d9a906d0c75ffe598b1a88e51fe7db94209 (diff) | |
| download | subsurface-7dd8a62ceddbb2205bd41260964f3450e72fccab.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 8 |
1 files changed, 0 insertions, 8 deletions
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 |