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 scripts: work with both Qt 5.5 and 5.6

Browse source 
This is all a bit hackish but seems to work

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-03 14:32:23 -08:00
parent 01ae4af13d
commit 2b1812f2cb
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packaging/android/build.sh
View file

@ -20,7 +20,16 @@ fi
# Configure where we can find things here
export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
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
else
echo "Cannot find Qt 5.5 or 5.6 under $SUBSURFACE_SOURCE/../Qt"
exit 1
fi
if [ $PLATFORM = Darwin ] ; then
export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-macosx
export ANDROID_NDK_HOST=darwin-x86_64