diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 67 |
1 files changed, 29 insertions, 38 deletions
diff --git a/tools/configure b/tools/configure index 2b4a05d7e8..5a380608bf 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -666,47 +666,38 @@ androidcc () { | |||
666 | exit | 666 | exit |
667 | fi | 667 | fi |
668 | buildhost=$(uname | tr "[:upper:]" "[:lower:]") | 668 | buildhost=$(uname | tr "[:upper:]" "[:lower:]") |
669 | gccchoice="4.4.3" | ||
670 | gcctarget="arm-linux-androideabi-" | ||
671 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/$buildhost-x86 | ||
672 | PATH=$PATH:$gccprefix/bin | ||
673 | prefixtools $gcctarget | ||
674 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 669 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
675 | GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ | 670 | LDOPTS=" $LDOPTS -shared -ldl -llog" |
676 | --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" | ||
677 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" | 671 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" |
678 | LDOPTS="-shared -ldl -llog --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm $LDOPTS" | 672 | thread_support="HAVE_SIGALTSTACK_THREADS" # force for all archs |
679 | endian="little" | 673 | ANDROID_ARCH=$1 # for android.make too |
680 | SHARED_LDFLAG="-shared" | 674 | # arch dependant stuff |
681 | ANDROID_ARCH=armeabi | 675 | case $ANDROID_ARCH in |
682 | } | 676 | armeabi) |
683 | 677 | endian="little" | |
684 | androidmipscc () { | 678 | gccchoice="4.4.3" |
685 | if [ -z "$ANDROID_SDK_PATH" ]; then | 679 | gcctarget="arm-linux-androideabi-" |
686 | echo "ERROR: You need the Android SDK installed and have the ANDROID_SDK_PATH" | 680 | GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ |
687 | echo "environment variable point to the root directory of the Android SDK." | 681 | --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" |
688 | exit | 682 | LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" |
689 | fi | 683 | ;; |
690 | if [ -z "$ANDROID_NDK_PATH" ]; then | 684 | mips) |
691 | echo "ERROR: You need the Android NDK installed (r5 or higher) and have the ANDROID_NDK_PATH" | 685 | endian="little" |
692 | echo "environment variable point to the root directory of the Android NDK." | 686 | gccchoice="4.4.3" |
693 | exit | 687 | gcctarget="mipsel-linux-android-" |
694 | fi | 688 | GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ |
695 | buildhost=$(uname | tr "[:upper:]" "[:lower:]") | 689 | --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC" |
696 | gccchoice="4.4.3" | 690 | LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips" |
697 | gcctarget="mipsel-linux-android-" | 691 | ;; |
692 | *) | ||
693 | echo "ERROR: androidcc(): Unknown target architecture" | ||
694 | exit | ||
695 | ;; | ||
696 | esac | ||
697 | echo "Application environment deemed $endian endian" | ||
698 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/$buildhost-x86 | 698 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/$buildhost-x86 |
699 | thread_support="HAVE_SIGALTSTACK_THREADS" | ||
700 | PATH=$PATH:$gccprefix/bin | 699 | PATH=$PATH:$gccprefix/bin |
701 | prefixtools $gcctarget | 700 | prefixtools $gcctarget |
702 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | ||
703 | GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ | ||
704 | --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC" | ||
705 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" | ||
706 | LDOPTS="-shared -ldl -llog --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips $LDOPTS" | ||
707 | endian="little" | ||
708 | SHARED_LDFLAG="-shared" | ||
709 | ANDROID_ARCH=mips | ||
710 | } | 701 | } |
711 | 702 | ||
712 | whichadvanced () { | 703 | whichadvanced () { |
@@ -3223,7 +3214,7 @@ fi | |||
3223 | libdir="/data/data/org.rockbox/app_rockbox" | 3214 | libdir="/data/data/org.rockbox/app_rockbox" |
3224 | memory=8 | 3215 | memory=8 |
3225 | uname=`uname` | 3216 | uname=`uname` |
3226 | androidcc | 3217 | androidcc armeabi |
3227 | tool="cp " | 3218 | tool="cp " |
3228 | boottool="cp " | 3219 | boottool="cp " |
3229 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 3220 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -3355,7 +3346,7 @@ fi | |||
3355 | libdir="/data/data/org.rockbox/app_rockbox" | 3346 | libdir="/data/data/org.rockbox/app_rockbox" |
3356 | memory=8 | 3347 | memory=8 |
3357 | uname=`uname` | 3348 | uname=`uname` |
3358 | androidmipscc | 3349 | androidcc mips |
3359 | tool="cp " | 3350 | tool="cp " |
3360 | boottool="cp " | 3351 | boottool="cp " |
3361 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 3352 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |