Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert make

Browse source
This commit is contained in:
Victor Shcherb 2013-02-23 00:44:19 +01:00
parent b3aed47595
commit 7f01aff618
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/ndk-build.sh
View file

@ -40,7 +40,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv5_ONLY"
./configure $QTBASE_CONFIGURATION \ ./configure $QTBASE_CONFIGURATION \
-no-neon) -no-neon)
fi fi
(cd "$SRCLOC/upstream.patched.armeabi") (cd "$SRCLOC/upstream.patched.armeabi" && make -j`nproc`)
fi fi
if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY" ]; then if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY" ]; then
@ -52,7 +52,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY
./configure $QTBASE_CONFIGURATION \ ./configure $QTBASE_CONFIGURATION \
-no-neon) -no-neon)
fi fi
(cd "$SRCLOC/upstream.patched.armeabi-v7a") (cd "$SRCLOC/upstream.patched.armeabi-v7a" && make -j`nproc`)
if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a-neon" ]; then if [ ! -d "$SRCLOC/upstream.patched.armeabi-v7a-neon" ]; then
cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a-neon" cp -rf "$SRCLOC/upstream.patched" "$SRCLOC/upstream.patched.armeabi-v7a-neon"
@ -62,7 +62,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_ARM_ONLY" ] || [ -n "$OSMAND_ARMv7a_ONLY
./configure $QTBASE_CONFIGURATION \ ./configure $QTBASE_CONFIGURATION \
-qtlibinfix _neon) -qtlibinfix _neon)
fi fi
(cd "$SRCLOC/upstream.patched.armeabi-v7a-neon") (cd "$SRCLOC/upstream.patched.armeabi-v7a-neon" && make -j`nproc`)
fi fi
if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then
@ -73,7 +73,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_X86_ONLY" ]; then
(cd "$SRCLOC/upstream.patched.x86" && \ (cd "$SRCLOC/upstream.patched.x86" && \
./configure $QTBASE_CONFIGURATION) ./configure $QTBASE_CONFIGURATION)
fi fi
(cd "$SRCLOC/upstream.patched.x86") (cd "$SRCLOC/upstream.patched.x86" && make -j`nproc`)
fi fi
if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then
@ -84,7 +84,7 @@ if [ -n "$BUILD_ALL" ] || [ -n "$OSMAND_MIPS_ONLY" ]; then
(cd "$SRCLOC/upstream.patched.mips" && \ (cd "$SRCLOC/upstream.patched.mips" && \
./configure $QTBASE_CONFIGURATION) ./configure $QTBASE_CONFIGURATION)
fi fi
(cd "$SRCLOC/upstream.patched.mips") (cd "$SRCLOC/upstream.patched.mips" && make -j`nproc`)
fi fi
(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) (cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`)