diff options
| author |  Marco Martin <notmart@gmail.com> | 2016-06-22 18:17:25 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 07:56:05 -0700 |
| commit | 24718adfc3c2d7caaddd307289ba69fa706315c9 (patch) | |
| tree | 39ede99be41e6908e73d1899c9d5ab071bf363a7 /scripts | |
| parent | 545c60a517402346aa04e2b67284827d510ec71d (diff) | |
| download | subsurface-24718adfc3c2d7caaddd307289ba69fa706315c9.tar.gz | |
Use kirigami built in static mode
Now kirigami needs to be built with a C++ plugin.
In cases of mobile operating systems such as iOS (and in a lesser measuse,
Android) having a proper plugin loaded at runtime may be difficult, so
statically link it together with all of its qml files compiled as a
qresource inside the static library.
Signed-off-by: Marco Martin <notmart@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 10 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 014d2d32b..635f1b155 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -211,6 +211,9 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then make install fi + + + # finally, build Subsurface if [ $PLATFORM = Darwin ] ; then @@ -229,6 +232,13 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then cd $SRC/subsurface bash ./scripts/mobilecomponents.sh + + cd $SRC/subsurface/mobile-widgets/qml/kirigami/ + mkdir -p build + cd build + cmake .. -DSTATIC_LIBRARY=ON + make -j4 + make install fi mkdir -p $SRC/subsurface/$BUILDDIR diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index ec1e97f97..4072bf413 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -44,16 +44,12 @@ fi # now copy the components and a couple of icons into plae MC=$SRC/subsurface/mobile-widgets/qml/kirigami -PMMC=kirigami/src/qml +PMMC=kirigami BREEZE=breeze-icons rm -rf $MC mkdir -p $MC/icons cp -R $PMMC/* $MC/ -cp $PMMC/../fallbacktheme/*qml $MC/ - -# fix plugin requirement -sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $MC/qmldir cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons |