mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
545c60a517
commit
24718adfc3
6 changed files with 40 additions and 50 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue