F***, don't mix tabs with spaces
This commit is contained in:
parent
e4ec9dbf52
commit
a3f4cbd9fb
1 changed files with 49 additions and 50 deletions
|
@ -1,10 +1,11 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
# configure.sh
|
|
||||||
"$SCRIPT_LOC"/../../core/externals/configure.sh
|
|
||||||
SRCLOC="$SCRIPT_LOC"/../../core/externals/qtbase-android
|
|
||||||
NAME=$(basename $(dirname "${BASH_SOURCE[0]}") )
|
NAME=$(basename $(dirname "${BASH_SOURCE[0]}") )
|
||||||
|
|
||||||
|
"$SCRIPT_LOC/../../core/externals/configure.sh"
|
||||||
|
SRCLOC="$SCRIPT_LOC/../../core/externals/qtbase-android"
|
||||||
|
|
||||||
if [ ! -d "$ANDROID_SDK" ]; then
|
if [ ! -d "$ANDROID_SDK" ]; then
|
||||||
echo "ANDROID_SDK is not set"
|
echo "ANDROID_SDK is not set"
|
||||||
exit
|
exit
|
||||||
|
@ -30,7 +31,6 @@ QTBASE_CONFIGURATION=\
|
||||||
"-c++11 -shared -release "\
|
"-c++11 -shared -release "\
|
||||||
"-v"
|
"-v"
|
||||||
|
|
||||||
|
|
||||||
if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv5_ONLY" ]; then
|
if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv5_ONLY" ]; then
|
||||||
if [ ! -d "$SRCLOC/upstream.patched.armeabi" ]; then
|
if [ ! -d "$SRCLOC/upstream.patched.armeabi" ]; then
|
||||||
cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi"
|
cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi"
|
||||||
|
@ -87,5 +87,4 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then
|
||||||
(cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`)
|
(cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $SCRIPT_LOC
|
(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`)
|
||||||
$ANDROID_NDK/ndk-build -j`nproc`
|
|
Loading…
Reference in a new issue