Search
lxdream.org :: lxdream/configure :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure
changeset 1245:01e0020adf88
prev1239:be3121267597
next1255:d63f73cc586f
author nkeynes
date Fri Mar 02 23:49:10 2012 +1000 (9 years ago)
permissions -rw-r--r--
last change Android WIP:
* Rename gui_jni.c to gui_android.c - now quite android specific.
* Implement generic EGL driver with very minimal Java wrapper
* Run emulation in separate thread, and implement simple queue for
inter-thread communication.
* Add menu/action-bar items for start + reset
file annotate diff log raw
1.1 --- a/configure Sat Feb 25 21:30:49 2012 +1000
1.2 +++ b/configure Fri Mar 02 23:49:10 2012 +1000
1.3 @@ -686,6 +686,7 @@
1.4 ANDROID_SDK_HOME
1.5 ANDROID_NDK_HOME
1.6 ANDROID_SDK_VERSION
1.7 +ANDROID_NDK_VERSION
1.8 ANDROID_GDBSERVER
1.9 GUI_ANDROID_TRUE
1.10 GUI_ANDROID_FALSE
1.11 @@ -1465,6 +1466,7 @@
1.12 --with-android=SDK Specify the location of the Android SDK
1.13 --with-android-ndk=NDK Specify the location of the Android NDK
1.14 --with-android-version Specify target Android SDK version
1.15 + --with-android-version Specify target Android NDK version
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 @@ -2543,7 +2545,15 @@
1.20 if test "${with_android_version+set}" = set; then
1.21 withval=$with_android_version;
1.22 else
1.23 - with_android_version="android-8"
1.24 + with_android_version="android-11"
1.25 +fi
1.26 +
1.27 +
1.28 +# Check whether --with-android-ndk-version was given.
1.29 +if test "${with_android_ndk_version+set}" = set; then
1.30 + withval=$with_android_ndk_version;
1.31 +else
1.32 + with_ndk_version="android-9"
1.33 fi
1.34
1.35
1.36 @@ -2562,6 +2572,7 @@
1.37 ANDROID_SDK_HOME="$with_android"
1.38 ANDROID_NDK_HOME="$with_android_ndk"
1.39 ANDROID_SDK_VERSION="$with_android_version"
1.40 + ANDROID_NDK_VERSION="$with_ndk_version"
1.41
1.42 as_ac_File=`echo "ac_cv_file_$ANDROID_SDK_HOME/tools/ant/pre_setup.xml" | $as_tr_sh`
1.43 { echo "$as_me:$LINENO: checking for $ANDROID_SDK_HOME/tools/ant/pre_setup.xml" >&5
1.44 @@ -2653,7 +2664,7 @@
1.45 host_os="linux-androideabi"
1.46 ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
1.47 ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
1.48 - ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-arm"
1.49 + ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-arm"
1.50 TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
1.51 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.52 ;;
1.53 @@ -2664,7 +2675,7 @@
1.54 host_os="linux"
1.55 ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
1.56 ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
1.57 - ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-x86"
1.58 + ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-x86"
1.59 TARGETFLAGS=""
1.60 ;;
1.61 *)
1.62 @@ -2725,7 +2736,8 @@
1.63 OBJDUMP="$ANDROID_NDK_BIN/${host_alias}-objdump"
1.64 CPPFLAGS="-fPIC --sysroot=$ANDROID_SYSROOT -I$ANDROID_SYSROOT/usr/include $TARGETFLAGS $CPPFLAGS"
1.65 LDFLAGS="-nostdlib -Wl,--no-undefined -L${ANDROID_SYSROOT}/usr/lib -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib -Wl,-allow-shlib-undefined -Wl,-z,noexecstack $LDFLAGS"
1.66 - LIBS="$LIBS -liconv -llog -lgcc -lc"
1.67 + LIBS="$LIBS -liconv -landroid -llog -lgcc -lc -lm"
1.68 +
1.69
1.70
1.71
1.72 @@ -8966,16 +8978,16 @@
1.73
1.74
1.75
1.76 -
1.77 if test "$ANDROID_BUILD" = "yes"; then
1.78 with_gtk=no;
1.79 EXTRA_OUTPUT_FILES="src/android/build.properties"
1.80 - LIBS="-lGLESv2 $LIBS"
1.81 + LIBS="-lEGL -lGLESv2 $LIBS"
1.82
1.83 cat >>confdefs.h <<\_ACEOF
1.84 #define HAVE_GLES2 1
1.85 _ACEOF
1.86
1.87 + UI_DRIVER="Android"
1.88 with_sdl=no
1.89 else
1.90
1.91 @@ -9442,6 +9454,7 @@
1.92 #define APPLE_BUILD 1
1.93 _ACEOF
1.94
1.95 + UI_DRIVER="Cocoa"
1.96 if test "x$with_gtk" = "xx11"; then
1.97 with_gtk=no
1.98 fi
1.99 @@ -11020,6 +11033,7 @@
1.100 #define HAVE_GTK 1
1.101 _ACEOF
1.102
1.103 + UI_DRIVER="GTK"
1.104
1.105 fi
1.106
1.107 @@ -16749,6 +16763,7 @@
1.108 ANDROID_SDK_HOME!$ANDROID_SDK_HOME$ac_delim
1.109 ANDROID_NDK_HOME!$ANDROID_NDK_HOME$ac_delim
1.110 ANDROID_SDK_VERSION!$ANDROID_SDK_VERSION$ac_delim
1.111 +ANDROID_NDK_VERSION!$ANDROID_NDK_VERSION$ac_delim
1.112 ANDROID_GDBSERVER!$ANDROID_GDBSERVER$ac_delim
1.113 GUI_ANDROID_TRUE!$GUI_ANDROID_TRUE$ac_delim
1.114 GUI_ANDROID_FALSE!$GUI_ANDROID_FALSE$ac_delim
1.115 @@ -16772,7 +16787,6 @@
1.116 CC!$CC$ac_delim
1.117 CFLAGS!$CFLAGS$ac_delim
1.118 CPPFLAGS!$CPPFLAGS$ac_delim
1.119 -CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
1.120 _ACEOF
1.121
1.122 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.123 @@ -16814,6 +16828,7 @@
1.124 ac_delim='%!_!# '
1.125 for ac_last_try in false false false false false :; do
1.126 cat >conf$$subs.sed <<_ACEOF
1.127 +CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
1.128 ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
1.129 CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
1.130 am__fastdepCC_FOR_BUILD_TRUE!$am__fastdepCC_FOR_BUILD_TRUE$ac_delim
1.131 @@ -16910,7 +16925,6 @@
1.132 BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim
1.133 BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
1.134 LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
1.135 -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
1.136 _ACEOF
1.137
1.138 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.139 @@ -16952,6 +16966,7 @@
1.140 ac_delim='%!_!# '
1.141 for ac_last_try in false false false false false :; do
1.142 cat >conf$$subs.sed <<_ACEOF
1.143 +GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
1.144 USE_NLS!$USE_NLS$ac_delim
1.145 MSGFMT!$MSGFMT$ac_delim
1.146 MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
1.147 @@ -16972,7 +16987,7 @@
1.148 LTLIBOBJS!$LTLIBOBJS$ac_delim
1.149 _ACEOF
1.150
1.151 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
1.152 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
1.153 break
1.154 elif $ac_last_try; then
1.155 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.156 @@ -17613,18 +17628,14 @@
1.157 echo "Configuration complete"
1.158 echo
1.159
1.160 -if test "x$HAVE_GTK" = x; then
1.161 - if test "x$HAVE_COCOA" = x; then
1.162 - echo " User interface: none"
1.163 - else
1.164 - echo " User interface: Cocoa"
1.165 - fi
1.166 -else
1.167 - echo " User interface: GTK"
1.168 +if test "x$UI_DRIVER" = x; then
1.169 + echo " User interface: none"
1.170 +else
1.171 + echo " User interface: $UI_DRIVER"
1.172 fi
1.173
1.174 if test "x$SH4_TRANSLATOR" = "x"; then
1.175 - echo " SH4 translator: None (emulation core only)"
1.176 + echo " SH4 translator: none (emulation core only)"
1.177 else
1.178 echo " SH4 translator: $SH4_TRANSLATOR"
1.179 fi
.