diff options
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | m4/xbmc_arch.m4 | 2 | ||||
| -rw-r--r-- | tools/android/packaging/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/configure.in | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 0337705b66..8fcbe86cbe 100644 --- a/configure.in +++ b/configure.in @@ -606,13 +606,19 @@ ffmpeg_target_os=$(tolower $(uname -s)) # host detection and setup case $host in - i*86*-android-linux-gnu*) + i*86*-linux-android*) target_platform=target_android ARCH="i486-linux" use_arch="x86" use_cpu="i686" ffmpeg_target_os=linux - ;; + use_joystick=no + use_gles=yes + use_optical_drive=no + use_sdl=no + use_x11=no + build_shared_lib=yes + ;; i*86*-linux-gnu*) ARCH="i486-linux" ;; diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 index 147f0b1d82..5ae75bcf97 100644 --- a/m4/xbmc_arch.m4 +++ b/m4/xbmc_arch.m4 @@ -32,7 +32,7 @@ case $host in arm*-*-linux-gnu*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - arm*-*linux-android*) + *-*linux-android*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID") ;; *) diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile index ecdb9bd4bf..d10be8b883 100644 --- a/tools/android/packaging/Makefile +++ b/tools/android/packaging/Makefile @@ -22,7 +22,7 @@ ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$( #this fixes a android ndk fuckup where the pathes to #prebuilt stuff follow different name shemes for #arm and x86 -ifeq ($(findstring x86,$$(CPU)),x86) +ifeq ($(findstring i686,$(CPU)),i686) ARCH=x86 endif ifeq ($(findstring arm,$(CPU)),arm) diff --git a/tools/depends/configure.in b/tools/depends/configure.in index f19b787728..921ac1191c 100644 --- a/tools/depends/configure.in +++ b/tools/depends/configure.in @@ -102,7 +102,7 @@ case $host in #android builds are always cross cross_compiling="yes" ;; - i*86*-android-linux-gnu*) + i*86*-linux-android*) if test "x$use_cpu" = "xauto"; then use_cpu=$host_cpu fi |