diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 6db07221c..413d73933 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -33,7 +33,7 @@ RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9" StartupMenuButtonTimeout=3000 HiddenMenuOptions='OptionalDownloadConfig' FirstStartMenuOptions='' -MultiABI=n +MultiABI=y AppVersionCode=101 AppVersionName="1.01" ResetSdlConfigForThisVersion=n diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh new file mode 100755 index 000000000..6bbae82c5 --- /dev/null +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -0,0 +1,109 @@ +#!/bin/sh + +IFS=' +' + +MYARCH=linux-x86 +if uname -s | grep -i "linux" > /dev/null ; then + MYARCH=linux-x86 +fi +if uname -s | grep -i "darwin" > /dev/null ; then + MYARCH=darwin-x86 +fi +if uname -s | grep -i "windows" > /dev/null ; then + MYARCH=windows-x86 +fi + +NDK=`which ndk-build` +NDK=`dirname $NDK` +NDK=`readlink -f $NDK` + +#echo NDK $NDK +GCCPREFIX=arm-linux-androideabi +GCCVER=4.4.3 +PLATFORMVER=android-8 +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` +#echo LOCAL_PATH $LOCAL_PATH + +APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'` +APP_AVAILABLE_STATIC_LIBS=`grep 'APP_AVAILABLE_STATIC_LIBS [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'` +APP_SHARED_LIBS=$( +echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do + STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"` + if [ -n "$STATIC" ] ; then true + else + echo $LIB + fi +done +) + + +MISSING_INCLUDE= +MISSING_LIB= + +#if [ -n "$CRYSTAX_WCHAR" ]; then +# MISSING_INCLUDE="$MISSING_INCLUDE -isystem$NDK/sources/crystax/include" +# MISSING_LIB="$MISSING_LIB $NDK/sources/crystax/libs/armeabi/libcrystax_static.a" +#fi +#if [ -n "$MISSING_LIBCXX_PATH" ]; then +# MISSING_INCLUDE="$MISSING_INCLUDE -isystem$NDK/sources/cxx-stl/gnu-libstdc++/include" +# MISSING_LIB="$MISSING_LIB -lgnustl_static -lsupc++" +#fi + + +CFLAGS="\ +-fexceptions -frtti \ +-MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector \ +-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \ +-Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \ +-DANDROID -Wa,--noexecstack -g -O2 -DNDEBUG -g \ +-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \ +-isystem$NDK/sources/cxx-stl/gnu-libstdc++/include \ +-isystem$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include \ +-isystem$LOCAL_PATH/../sdl-1.2/include \ +`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"` \ +$MISSING_INCLUDE $CFLAGS" + +SHARED="-shared -Wl,-soname,libapplication.so" +if [ -n "$BUILD_EXECUTABLE" ]; then + SHARED= +fi +if [ -n "$NO_SHARED_LIBS" ]; then + APP_SHARED_LIBS= +fi + +LDFLAGS="\ +-fexceptions -frtti $SHARED \ +--sysroot=$NDK/platforms/$PLATFORMVER/arch-arm \ +`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/armeabi-v7a/lib\1.so@g\"` \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libc.so \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libm.so \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libGLESv1_CM.so \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libdl.so \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/liblog.so \ +$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libz.so \ +-L$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a \ +-lgnustl_static \ +-L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \ +-L$LOCAL_PATH/../../obj/local/armeabi-v7a \ +-Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack \ +-Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib -lsupc++ \ +$MISSING_LIB $LDFLAGS" + +#echo env CFLAGS=\""$CFLAGS"\" LDFLAGS=\""$LDFLAGS"\" "$@" + +env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \ +CFLAGS="$CFLAGS" \ +CXXFLAGS="$CFLAGS" \ +LDFLAGS="$LDFLAGS" \ +CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \ +CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \ +RANLIB="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \ +LD="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \ +AR="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \ +CPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp $CFLAGS" \ +NM="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \ +AS="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \ +STRIP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \ +"$@"