diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-31 10:08:56 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-31 10:16:29 -0700 |
| commit | 4e16bd7dcedd38eab9dac86b6bae3b1858c59fbb (patch) | |
| tree | 2b2d9e93ce6ef98991c8eda655cddf20fcbeeee4 /packaging | |
| parent | 286bac6d30cf0b9ba5ad2a1fb6cce3287d5aa544 (diff) | |
| download | subsurface-4e16bd7dcedd38eab9dac86b6bae3b1858c59fbb.tar.gz | |
Android build script: update for Qt 5.9
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index dcc2ec493..527ee38b0 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -2,13 +2,16 @@ # run this in the top level folder you want to create Android binaries in # -# it seems that with Qt5.7.1 or Qt5.8 and current cmake there is an odd bug where +# it seems that with Qt5.7 (and later) and current cmake there is an odd bug where # cmake fails reporting :No known features for CXX compiler "GNU". In that # case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)" # at line 101 of # Qt/5.7/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # or at line 95 of # Qt/5.8/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake +# or at line 105 of +# Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake +# (this script tries to do this automatically) exec 1> >(tee ./build.log) 2>&1 @@ -16,8 +19,8 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac) # these are the current versions for Qt, Android SDK & NDK: -QT_VERSION=5.8 -LATEST_QT=5.8.0 +QT_VERSION=5.9 +LATEST_QT=5.9.0 NDK_VERSION=r13b SDK_VERSION=r25.2.3 @@ -31,7 +34,7 @@ export SUBSURFACE_SOURCE=$PWD popd if [ "$PLATFORM" = Linux ] ; then - QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run + QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip SDK_TOOLS=tools_${SDK_VERSION}-linux.zip else @@ -64,7 +67,7 @@ if [ ! -d Qt ] ; then wget -q ${QT_DOWNLOAD_URL} fi chmod +x ./${QT_BINARIES} - ./${QT_BINARIES} -platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations + ./${QT_BINARIES} --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations fi # patch the cmake / Qt5.7.1 incompatibility mentioned above |