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

Teach android build script out of tree builds

Browse source 
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>
This commit is contained in:
Anton Lundin 2015-07-09 00:42:09 +02:00 • committed by Dirk Hohndel
parent b560dc6293
commit 016c56a210
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/android/build.sh
View file

@ -1,10 +1,15 @@
#!/bin/bash #!/bin/bash
set -e 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 # Configure where we can find things here
export ANDROID_NDK_ROOT=$PWD/../../../android-ndk-r10e export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
export ANDROID_SDK_ROOT=$PWD/../../../android-sdk-linux export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-linux
export QT5_ANDROID=$PWD/../../../Qt/5.4 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.4
export ANDROID_NDK_HOST=linux-x86 export ANDROID_NDK_HOST=linux-x86
# Which versions are we building against? # Which versions are we building against?
@ -145,7 +150,7 @@ fi
if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then
mkdir -p libdivecomputer-build-$ARCH mkdir -p libdivecomputer-build-$ARCH
pushd 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
make install make install
popd popd
@ -153,7 +158,7 @@ fi
mkdir -p subsurface-build-$ARCH mkdir -p subsurface-build-$ARCH
cd 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
#make install INSTALL_ROOT=android_build #make install INSTALL_ROOT=android_build
# bug in androiddeployqt? why is it looking for something with the builddir in it? # bug in androiddeployqt? why is it looking for something with the builddir in it?