From 6df69b59995b12dd4db29d2daa636a14e3021c28 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 3 Nov 2010 17:43:37 +0200 Subject: [PATCH] Fixed ScummVM compilation --- project/jni/application/scummvm/AndroidBuild.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/project/jni/application/scummvm/AndroidBuild.sh b/project/jni/application/scummvm/AndroidBuild.sh index 4eb90cfa6..d8e3267af 100755 --- a/project/jni/application/scummvm/AndroidBuild.sh +++ b/project/jni/application/scummvm/AndroidBuild.sh @@ -1,5 +1,8 @@ #!/bin/sh +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + # Hacks for broken configure scripts #rm -rf $LOCAL_PATH/../../obj/local/armeabi/libSDL_*.so #rm -rf $LOCAL_PATH/../../obj/local/armeabi/libsdl_main.so @@ -14,12 +17,12 @@ # ln -sf libsdl_$LIBNAME.so $LOCAL_PATH/../../obj/local/armeabi/libSDL_$LIBNAME.so #done +ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/armeabi/libvorbisidec.a +ln -sf libflac.a $LOCAL_PATH/../../../obj/local/armeabi/libFLAC.a if [ \! -f scummvm/config.mk ] ; then - ../setEnvironment.sh sh -c "cd scummvm && ./configure --host=androidsdl --enable-zlib --enable-tremor --enable-mad --enable-flac --enable-vkeybd --enable-verbose-build --disable-hq-scalers --disable-readline --disable-nasm" + ../setEnvironment.sh sh -c "cd scummvm && env TREMOR_LIBS='-ltremor -logg' ./configure --host=androidsdl --enable-zlib --enable-tremor --enable-mad --enable-flac --enable-vkeybd --enable-verbose-build --disable-hq-scalers --disable-readline --disable-nasm --datadir=." fi rm -f ../libapplication.so -make -C scummvm -j2 -mv -f scummvm/scummvm ../libapplication.so - -cd .. +../setEnvironment.sh make -C scummvm -j2 +mv -f scummvm/scummvm libapplication.so