diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2015-07-09 00:42:09 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-08 15:47:55 -0700 |
| commit | 016c56a210c709635dbbed4b52547d2a87203d2f (patch) | |
| tree | 30d7798001962e428a806c783d5fde7ecddbcff9 | |
| parent | b560dc629397a7130c806dec8302bc76e8f73182 (diff) | |
| download | subsurface-016c56a210c709635dbbed4b52547d2a87203d2f.tar.gz | |
Teach android build script out of tree builds
This teaches the android build script how to do out of tree builds.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/build.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index f8d61e094..416d3dabf 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -1,10 +1,15 @@ #!/bin/bash set -e +# (trick to get the absolute path, either if we're called with a +# absolute path or a relative path) +pushd $(dirname $0)/../../ +export SUBSURFACE_SOURCE=$PWD +popd # Configure where we can find things here -export ANDROID_NDK_ROOT=$PWD/../../../android-ndk-r10e -export ANDROID_SDK_ROOT=$PWD/../../../android-sdk-linux -export QT5_ANDROID=$PWD/../../../Qt/5.4 +export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e +export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-linux +export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.4 export ANDROID_NDK_HOST=linux-x86 # Which versions are we building against? @@ -145,7 +150,7 @@ fi if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then mkdir -p libdivecomputer-build-$ARCH pushd libdivecomputer-build-$ARCH - ../../../../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared + $SUBSURFACE_SOURCE/../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared make make install popd @@ -153,7 +158,7 @@ fi mkdir -p subsurface-build-$ARCH cd subsurface-build-$ARCH -cmake -DCMAKE_SYSTEM_NAME=Android -DLIBDC_FROM_PKGCONFIG=ON -DLIBGIT2_FROM_PKGCONFIG=ON -DUSE_LIBGIT23_API=ON -DNO_MARBLE=ON -DNO_PRINTING=ON -DNO_USERMANUAL=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake ../../../ +cmake -DCMAKE_SYSTEM_NAME=Android -DLIBDC_FROM_PKGCONFIG=ON -DLIBGIT2_FROM_PKGCONFIG=ON -DUSE_LIBGIT23_API=ON -DNO_MARBLE=ON -DNO_PRINTING=ON -DNO_USERMANUAL=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake $SUBSURFACE_SOURCE make #make install INSTALL_ROOT=android_build # bug in androiddeployqt? why is it looking for something with the builddir in it? |