aboutsummaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2013-09-30 23:38:18 -0700
committerMemphiz <memphis@machzwo.de>2013-09-30 23:38:18 -0700
commit1755968b34ad145bc572b8e6593eb8d3bcb0a528 (patch)
tree6cf1f39b80ef7f994e6e715273a21d1be4ade745 /configure.in
parentb727bbcc8ef601d3bd5ddd5b20c2fa7da5c5dfb7 (diff)
parentdefeb74de10c317201b88bb17677643634ec4ec8 (diff)
Merge pull request #3256 from perpe/droid-x86
[Droid x86] Additions for Android x86 architecture
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index b98d41956e..ec5ea781aa 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"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then