mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system/mobile: force using our own ECM build

Browse source 
If the OS has an older one installed, that is found first and the
build fails. This way we know that ours is used.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-03 12:42:09 -08:00
parent 70470ffa45
commit 6439a9b441
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/android/qmake-build.sh
View file

@ -341,6 +341,7 @@ for ARCH in $ARCHITECTURES ; do
-DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_COMPILER="$CC" \
-DCMAKE_LINKER="$CC" \ -DCMAKE_LINKER="$CC" \
-DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-DECM_DIR="$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/ECM \
"$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami "$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami
make make
make install make install

1
scripts/build.sh
View file

@ -533,6 +533,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
# pull the plasma-mobile components from upstream if building Subsurface-mobile # pull the plasma-mobile components from upstream if building Subsurface-mobile
if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then
bash ./scripts/mobilecomponents.sh bash ./scripts/mobilecomponents.sh
EXTRA_OPTS="$EXTRA_OPTS -DECM_DIR=$SRC/$SRC_DIR/mobile-widgets/3rdparty/ECM"
fi fi
mkdir -p "$BUILDDIR" mkdir -p "$BUILDDIR"