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 /packaging | |
| 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 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index d844e8dca..408a5467d 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -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 |