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

Removed sdl_fake_stdout hack - it prevents standalone executables to link

Browse Source
This commit is contained in:
pelya
2011-06-08 13:30:31 +03:00
parent 4a79eb6bde
commit c684662e0e
19 changed files with 32 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,11 +9,17 @@ ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
ln -sf libsdl_mixer.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so
ln -sf libsdl_image.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_image.so
ln -sf libsdl_ttf.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_ttf.so
rm -f libapplication.so
GCC_PREFIX=arm-eabi
if echo $CXX | grep 'arm-linux-androideabi'; then
GCC_PREFIX=arm-linux-androideabi
fi
if [ \! -f vcmi/Makefile -o $0 -nt vcmi/Makefile ] ; then
../setEnvironment.sh sh -c "cd vcmi && \
env LIBS='-lavcodec -lavutil -lavcore -lgcc' \
./configure --host=arm-eabi --enable-static \
./configure --host=$GCC_PREFIX --enable-static \
--with-boost-system=boost_system \
--with-boost-filesystem=boost_filesystem \
--with-boost-thread=boost_thread \
@@ -24,10 +30,11 @@ fi
../setEnvironment.sh sh -c "cd vcmi && \
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 &&
cp -f vcmi/client/vcmiclient libapplication.so || exit 1
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_image.so
rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_ttf.so
exit 0