Search
lxdream.org :: lxdream/configure :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure
changeset 1255:d63f73cc586f
prev1245:01e0020adf88
next1266:e6079b9c69ba
author nkeynes
date Sun Mar 04 20:56:40 2012 +1000 (9 years ago)
permissions -rw-r--r--
last change Add support for armv7-a abi and make it the default - it's a good bit faster
file annotate diff log raw
1.1 --- a/configure Fri Mar 02 23:49:10 2012 +1000
1.2 +++ b/configure Sun Mar 04 20:56:40 2012 +1000
1.3 @@ -683,6 +683,7 @@
1.4 host_vendor
1.5 host_os
1.6 ANT
1.7 +ANDROID_ABI
1.8 ANDROID_SDK_HOME
1.9 ANDROID_NDK_HOME
1.10 ANDROID_SDK_VERSION
1.11 @@ -1467,6 +1468,7 @@
1.12 --with-android-ndk=NDK Specify the location of the Android NDK
1.13 --with-android-version Specify target Android SDK version
1.14 --with-android-version Specify target Android NDK version
1.15 + --with-android-abi Specify target Android ABI
1.16 --with-osmesa Build with the osmesa GL library (software
1.17 rendering)
1.18 --with-gtk Build with the GTK UI. Default on X11 systems
1.19 @@ -2557,6 +2559,14 @@
1.20 fi
1.21
1.22
1.23 +# Check whether --with-android-abi was given.
1.24 +if test "${with_android_abi+set}" = set; then
1.25 + withval=$with_android_abi;
1.26 +else
1.27 + ANDROID_ABI="armeabi-v7a"
1.28 +fi
1.29 +
1.30 +
1.31 if test "x$with_android" != "x"; then
1.32 if test "$with_android" = "yes"; then
1.33 { { echo "$as_me:$LINENO: error: --with-android option must be given with the path to the Android SDK " >&5
1.34 @@ -2656,8 +2666,10 @@
1.35 fi
1.36
1.37
1.38 - case $host_alias in
1.39 - arm-* | "")
1.40 + TARGETFLAGS="-ffunction-sections -funwind-tables -fomit-frame-pointer -DANDROID -Wa,--noexecstack"
1.41 +
1.42 + case $ANDROID_ABI in
1.43 + armeabi | armeabi-v7a)
1.44 host_alias="arm-linux-androideabi"
1.45 host_cpu="arm"
1.46 host_vendor="unknown";
1.47 @@ -2665,10 +2677,14 @@
1.48 ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
1.49 ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
1.50 ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-arm"
1.51 - TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
1.52 - TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
1.53 + TARGETFLAGS="$TARGETFLAGS -fstack-protector -finline-limit=64 -fno-strict-aliasing -Wno-psabi -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
1.54 + if test "x$with_abi" = "armeabi"; then
1.55 + TARGETFLAGS="$TARGETFLAGS -march=armv5te -mtune=xscale -msoft-float"
1.56 + else
1.57 + TARGETFLAGS="$TARGETFLAGS -march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfp"
1.58 + fi
1.59 ;;
1.60 - i686-*)
1.61 + x86)
1.62 host_alias="i686-android-linux"
1.63 host_cpu="i686"
1.64 host_vendor="android"
1.65 @@ -2676,11 +2692,11 @@
1.66 ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
1.67 ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
1.68 ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-x86"
1.69 - TARGETFLAGS=""
1.70 + TARGETFLAGS="$TARGETFLAGS -finline-limit=300 -fno-rtti -funswitch-loops -fstrict-aliasing"
1.71 ;;
1.72 *)
1.73 - { { echo "$as_me:$LINENO: error: Unsupported android host $host_alias" >&5
1.74 -echo "$as_me: error: Unsupported android host $host_alias" >&2;}
1.75 + { { echo "$as_me:$LINENO: error: Unsupported android ABI $ANDROID_ABI" >&5
1.76 +echo "$as_me: error: Unsupported android ABI $ANDROID_ABI" >&2;}
1.77 { (exit 1); exit 1; }; }
1.78 ;;
1.79 esac
1.80 @@ -2744,6 +2760,7 @@
1.81
1.82
1.83
1.84 +
1.85 ANDROID_BUILD=yes
1.86 cross_compiling=yes
1.87 fi
1.88 @@ -16760,6 +16777,7 @@
1.89 host_vendor!$host_vendor$ac_delim
1.90 host_os!$host_os$ac_delim
1.91 ANT!$ANT$ac_delim
1.92 +ANDROID_ABI!$ANDROID_ABI$ac_delim
1.93 ANDROID_SDK_HOME!$ANDROID_SDK_HOME$ac_delim
1.94 ANDROID_NDK_HOME!$ANDROID_NDK_HOME$ac_delim
1.95 ANDROID_SDK_VERSION!$ANDROID_SDK_VERSION$ac_delim
1.96 @@ -16786,7 +16804,6 @@
1.97 CPP!$CPP$ac_delim
1.98 CC!$CC$ac_delim
1.99 CFLAGS!$CFLAGS$ac_delim
1.100 -CPPFLAGS!$CPPFLAGS$ac_delim
1.101 _ACEOF
1.102
1.103 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.104 @@ -16828,6 +16845,7 @@
1.105 ac_delim='%!_!# '
1.106 for ac_last_try in false false false false false :; do
1.107 cat >conf$$subs.sed <<_ACEOF
1.108 +CPPFLAGS!$CPPFLAGS$ac_delim
1.109 CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
1.110 ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
1.111 CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
1.112 @@ -16924,7 +16942,6 @@
1.113 BUILD_SYSTEST_FALSE!$BUILD_SYSTEST_FALSE$ac_delim
1.114 BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim
1.115 BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
1.116 -LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
1.117 _ACEOF
1.118
1.119 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.120 @@ -16966,6 +16983,7 @@
1.121 ac_delim='%!_!# '
1.122 for ac_last_try in false false false false false :; do
1.123 cat >conf$$subs.sed <<_ACEOF
1.124 +LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
1.125 GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
1.126 USE_NLS!$USE_NLS$ac_delim
1.127 MSGFMT!$MSGFMT$ac_delim
1.128 @@ -16987,7 +17005,7 @@
1.129 LTLIBOBJS!$LTLIBOBJS$ac_delim
1.130 _ACEOF
1.131
1.132 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
1.133 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
1.134 break
1.135 elif $ac_last_try; then
1.136 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
.