On 16 August 2016 at 06:20, Dirk Hohndel <[email protected]> wrote: > Once I fixed the build issues and added back a couple of our private > patches I was able to build a working Subsurface-mobile for iOS based on > Kirigami 1.0 (plus patches). > > Nice. Took me a LOT longer than I wanted, but hey... it's all good. > > 4.5.2.1525 should be available for testing on TestFlight, soon. > > Next I'll have to get this to work for Android :-) >
The attached patch was all that was needed to get a working Android build for me. Built against Kirigami master and QT 5.6.1 > /D > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface > -- Jocke
From 1b43c8ca5006bbb9163119461a70032e448bf18b Mon Sep 17 00:00:00 2001 From: Joakim Bygdell <[email protected]> Date: Tue, 16 Aug 2016 09:08:34 +0200 Subject: [PATCH] Android build: compile kirigami Build kirkigami plugin out of source and make sure that we use the same QT version for the plugin and the app. Signed-off-by: Joakim Bygdell <[email protected]> --- packaging/android/build.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 5319c4d..d844e8d 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -316,13 +316,12 @@ if [ "$SUBSURFACE_MOBILE" = "ON" ] ; then pushd $SUBSURFACE_SOURCE bash ./scripts/mobilecomponents.sh popd - - cd $SUBSURFACE_SOURCE/mobile-widgets/qml/kirigami/ - mkdir -p build - cd build - cmake .. -DSTATIC_LIBRARY=ON + 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 - make install + popd fi if [ ! -z "$SUBSURFACE_MOBILE" ] ; then -- 2.7.4
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
