mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
android: Prioritize newer Qt version if found
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
9443b0b86c
commit
2aa9841213
1 changed files with 7 additions and 5 deletions
|
@ -29,14 +29,16 @@ fi
|
|||
# Configure where we can find things here
|
||||
export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r12
|
||||
|
||||
if [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
|
||||
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.6
|
||||
if [ ! -z "$QT5_ANDROID" ] ; then
|
||||
echo "Using Qt5 in $QT5_ANDROID"
|
||||
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.7" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.7
|
||||
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.6
|
||||
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
|
||||
else
|
||||
echo "Cannot find Qt 5.5, 5.6, or 5.7 under $SUBSURFACE_SOURCE/../Qt"
|
||||
echo "Cannot find Qt 5.7, 5.6 or 5.5 under $SUBSURFACE_SOURCE/../Qt"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue