diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/configure b/tools/configure index ac24f5bd43..7098ba2fc8 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -119,7 +119,7 @@ app_get_platform() { | |||
119 | exit | 119 | exit |
120 | fi | 120 | fi |
121 | if [ -z "$ANDROID_NDK_PATH" ]; then | 121 | if [ -z "$ANDROID_NDK_PATH" ]; then |
122 | echo "ERROR: You need the Android NDK installed and have the ANDROID_NDK_PATH" | 122 | echo "ERROR: You need the Android NDK installed (r5 or higher) and have the ANDROID_NDK_PATH" |
123 | echo "environment variable point to the root directory of the Android NDK." | 123 | echo "environment variable point to the root directory of the Android NDK." |
124 | exit | 124 | exit |
125 | fi | 125 | fi |
@@ -478,12 +478,16 @@ mipselcc () { | |||
478 | } | 478 | } |
479 | 479 | ||
480 | androidcc () { | 480 | androidcc () { |
481 | gccchoice="4.4.0" | 481 | gccchoice="4.4.3" |
482 | prefixtools $ANDROID_NDK_PATH/build/prebuilt/linux-x86/arm-eabi-$gccchoice/bin/arm-eabi- | 482 | gcctarget="arm-linux-androideabi-" |
483 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/linux-x86 | ||
484 | PATH=$PATH:$gccprefix/bin prefixtools $gcctarget | ||
483 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 485 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
484 | GCCOPTS="$GCCOPTS -ffunction-sections -fno-short-enums -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer" | 486 | GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ |
485 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack -L$ANDROID_NDK_PATH/build/platforms/android-4/arch-arm/usr/lib/ -Wl,-rpath-link=$ANDROID_NKD_PATH/build/platforms/android-4/arch-arm/usr/lib" | 487 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" |
486 | LDOPTS="$LDOPTS -shared -nostdlib -lm -ldl -llog" | 488 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ |
489 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" | ||
490 | LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" | ||
487 | extradefines="$extradefines -DANDROID" | 491 | extradefines="$extradefines -DANDROID" |
488 | endian="little" | 492 | endian="little" |
489 | SHARED_FLAG="-shared" | 493 | SHARED_FLAG="-shared" |
@@ -3210,10 +3214,6 @@ if test -n "$t_cpu"; then | |||
3210 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl/" | 3214 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl/" |
3211 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/" | 3215 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/" |
3212 | fi | 3216 | fi |
3213 | if [ -n "$app_platform" -a "$app_platform" = "android" ]; then | ||
3214 | # android's gcc doesn't add this :/ | ||
3215 | TARGET_INC="$TARGET_INC -I$ANDROID_NDK_PATH/build/platforms/android-4/arch-arm/usr/include" | ||
3216 | fi | ||
3217 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer" | 3217 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer" |
3218 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu" | 3218 | TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu" |
3219 | GCCOPTS="$GCCOPTS" | 3219 | GCCOPTS="$GCCOPTS" |