From a7fe0daeff7abb3f2ca82af10a46b69aee1eed0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Duraffort?= Date: Sun, 9 Jan 2011 16:33:04 +0100 Subject: [PATCH] configure: simplification. --- configure.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/configure.sh b/configure.sh index 7933b5a36..35e760f2a 100755 --- a/configure.sh +++ b/configure.sh @@ -5,28 +5,12 @@ if [ -z "$ANDROID_NDK" ]; then exit 1 fi -# old android paths... -#ANDROID_BIN="$ANDROID_NDK/build/prebuilt/linux-x86/arm-eabi-4.4.0/bin/" -#ANDROID_INCLUDE="$ANDROID_NDK/build/platforms/android-8/arch-arm/usr/include" -#ANDROID_LIB="$ANDROID_NDK/build/platforms/android-8/arch-arm/usr/lib" - ANDROID_BIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/ ANDROID_INCLUDE=$ANDROID_NDK/platforms/android-9/arch-arm/usr/include ANDROID_LIB=$ANDROID_NDK/platforms/android-9/arch-arm/usr/lib VLC_SOURCEDIR="`pwd`/.." -if [ -e "$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib/libavcodec.a" ]; then - FFMPEG_SWITCH="--enable-swscale --enable-avcodec --enable-avformat" -else - FFMPEG_SWITCH="--disable-swscale --disable-avcodec --disable-avformat" -fi - - -DEPS_LIBDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib" -DEPS_INCLDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/include" - - # needed for old ndk: change all the arm-linux-androideabi to arm-eabi # the --host is kept on purpose because otherwise libtool complains.. @@ -49,7 +33,9 @@ sh ../configure --host=arm-eabi-linux --build=x86_64-unknown-linux \ --disable-libgcrypt \ --disable-remoteosd \ --disable-lua \ - $FFMPEG_SWITCH \ + --enable-swscale \ + --enable-avcodec \ + --enable-avformat \ --disable-xcb \ --disable-dbus \ --disable-vcd \