miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to ffmpeg and to VCMI

Browse Source
This commit is contained in:
pelya
2011-06-07 15:42:22 +03:00
parent 94a1c9f13e
commit b118aed813
18 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/vcmi/AndroidAppSettings.cfg
View File

@@ -23,11 +23,11 @@ AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
StartupMenuButtonTimeout=3000
HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig'
HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig OptionalDownloadConfig'
MultiABI=n
AppVersionCode=08501
AppVersionName="0.85.01"
CompiledLibraries="sdl_mixer sdl_image sdl_ttf avformat avcodec avutil avcore swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread"
CompiledLibraries="sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread"
CustomBuildScript=y
AppCflags=''
AppLdflags='-lz'

8
project/jni/application/vcmi/AndroidBuild.sh
View File

@@ -18,11 +18,13 @@ if [ \! -f vcmi/Makefile -o $0 -nt vcmi/Makefile ] ; then
--with-boost-filesystem=boost_filesystem \
--with-boost-thread=boost_thread \
--with-boost-iostreams=boost_iostreams \
--with-boost-program-options=boost_program_options" || { rm -f libapplication.so ; exit 1 ; }
--with-boost-program-options=boost_program_options \
--bindir=/data/data/eu.vcmi/lib" || { rm -f libapplication.so ; exit 1 ; }
fi
../setEnvironment.sh sh -c "cd vcmi && \
make -j4 AM_DEFAULT_VERBOSITY=1 pkgdatadir=." && \
cp -f vcmi/client/vcmiclient libapplication.so
make -j4 AM_DEFAULT_VERBOSITY=1 \
pkgdatadir=. pkglibdir=/data/data/eu.vcmi/lib bindir=/data/data/eu.vcmi/lib" && \
cp -f vcmi/client/vcmiclient libapplication.so &&
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so