diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 3517cf7b7..09e4a3cc2 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh CHANGE_APP_SETTINGS_VERSION=16 AUTO= diff --git a/RecompileAllApps.sh b/RecompileAllApps.sh index 70fb78d3e..8d27b2c89 100755 --- a/RecompileAllApps.sh +++ b/RecompileAllApps.sh @@ -3,6 +3,7 @@ KEYSTORE=~/.ssh/android.keystore ALIAS=pelya APPS_SKIP="src scummvm" +APPS_BUILD="$*" mkdir -p apk @@ -24,8 +25,12 @@ echo # First edit app settings if their format was changed for APP1 in project/jni/application/*/AndroidAppSettings.cfg; do APP=`echo $APP1 | sed 's@project/jni/application/\([^/]*\)/.*@\1@'` - if echo $APPS_SKIP | grep $APP > /dev/null ; then - continue + if [ -n "$APPS_BUILD" ] ; then + echo "$APPS_BUILD" | grep "$APP" || continue + else + if echo $APPS_SKIP | grep $APP > /dev/null ; then + continue + fi fi rm project/jni/application/src ln -s $APP project/jni/application/src @@ -37,8 +42,12 @@ done for APP1 in project/jni/application/*/AndroidAppSettings.cfg; do APP=`echo $APP1 | sed 's@project/jni/application/\([^/]*\)/.*@\1@'` - if echo $APPS_SKIP | grep $APP > /dev/null ; then - continue + if [ -n "$APPS_BUILD" ] ; then + echo "$APPS_BUILD" | grep "$APP" || continue + else + if echo $APPS_SKIP | grep $APP > /dev/null ; then + continue + fi fi rm -f project/jni/application/src ln -s $APP project/jni/application/src @@ -52,7 +61,7 @@ for APP1 in project/jni/application/*/AndroidAppSettings.cfg; do echo Compiling $APP APPVERSION=`grep 'AppVersionCode=' AndroidAppSettings.cfg | sed 's/AppVersionCode=\(.*\)/\1/'` OLDPATH="`pwd`" - ( cd project && nice -n5 $NDKBUILD -j2 V=1 && ant release && \ + ( cd project && nice -n5 $NDKBUILD -j4 V=1 && ant release && \ jarsigner -verbose -keystore "$KEYSTORE" -storepass "$PASSWORD" bin/DemoActivity-unsigned.apk $ALIAS && \ zipalign 4 bin/DemoActivity-unsigned.apk ../apk/$APP.apk && \ mkdir -p debuginfo/$APP-$APPVERSION && cp -f obj/local/armeabi/libapplication.so obj/local/armeabi/libsdl-*.so debuginfo/$APP-$APPVERSION && diff --git a/build.sh b/build.sh index 9901e9b3c..36dbc8887 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Set here your own NDK path if needed # export PATH=$PATH:~/src/endless_space/android-ndk-r4b diff --git a/buildQuick.sh b/buildQuick.sh index fac6fc5b0..7e6b8b950 100755 --- a/buildQuick.sh +++ b/buildQuick.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Set here your own NDK path if needed # export PATH=$PATH:~/src/endless_space/android-ndk-r4b diff --git a/project/jni/application/alienblaster/AndroidAppSettings.cfg b/project/jni/application/alienblaster/AndroidAppSettings.cfg index a3e237025..6439449e7 100644 --- a/project/jni/application/alienblaster/AndroidAppSettings.cfg +++ b/project/jni/application/alienblaster/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=4 AppTouchscreenKeyboardKeysAmountAutoFire=1 RedefinedKeysScreenKb="RETURN LCTRL PAGEUP PAGEDOWN LCTRL" MultiABI=n -AppVersionCode=110013 -AppVersionName="1.1.0.13 - fixed crashes for some devices" +AppVersionCode=110014 +AppVersionName="1.1.0.14" CompiledLibraries="sdl_mixer sdl_image" CustomBuildScript=n AppCflags='-O3' diff --git a/project/jni/application/commandergenius b/project/jni/application/commandergenius index 45476807e..72d8bf896 160000 --- a/project/jni/application/commandergenius +++ b/project/jni/application/commandergenius @@ -1 +1 @@ -Subproject commit 45476807e1b6f407446b2b87bb275009761398e2 +Subproject commit 72d8bf89698fe03583ef07c0dc0c854368d3a9d3 diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 7c2acd733..ef9093990 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" MultiABI=n -AppVersionCode=214909 -AppVersionName="2149.09" +AppVersionCode=214910 +AppVersionName="2149.10" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF' diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg index 931e00eef..598fe6e43 100644 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" MultiABI=n -AppVersionCode=10508 -AppVersionName="1.0.5.08" +AppVersionCode=10510 +AppVersionName="1.0.5.10" CompiledLibraries="png lzo2" CustomBuildScript=y AppCflags='' diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 62e4bfd02..68c9d2f68 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" MultiABI=n -AppVersionCode=10509 -AppVersionName="1.0.5.09" +AppVersionCode=10510 +AppVersionName="1.0.5.10" CompiledLibraries="jpeg png freetype timidity lzma lzo2" CustomBuildScript=y AppCflags='' diff --git a/project/jni/application/opentyrian/AndroidAppSettings.cfg b/project/jni/application/opentyrian/AndroidAppSettings.cfg index 38653de77..ce340cbaf 100644 --- a/project/jni/application/opentyrian/AndroidAppSettings.cfg +++ b/project/jni/application/opentyrian/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=4 AppTouchscreenKeyboardKeysAmountAutoFire=1 RedefinedKeysScreenKb="SPACE RETURN LCTRL LALT" MultiABI=n -AppVersionCode=2116 -AppVersionName="2.1.16 - fixed crashes for some devices" +AppVersionCode=2117 +AppVersionName="2.1.17" CompiledLibraries="sdl_net" CustomBuildScript=n AppCflags='-O3' diff --git a/project/jni/application/pachi/AndroidAppSettings.cfg b/project/jni/application/pachi/AndroidAppSettings.cfg index bdf93d7fe..3ab564891 100644 --- a/project/jni/application/pachi/AndroidAppSettings.cfg +++ b/project/jni/application/pachi/AndroidAppSettings.cfg @@ -1,5 +1,5 @@ # The application settings for Android libSDL port -AppSettingVersion=14 +AppSettingVersion=16 LibSdlVersion=1.2 AppName="Pachi el marciano" AppFullName=net.sourceforge.dragontech.pachi @@ -20,13 +20,15 @@ NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN" AppTouchscreenKeyboardKeysAmount=1 AppTouchscreenKeyboardKeysAmountAutoFire=0 +RedefinedKeysScreenKb="SPACE RETURN" MultiABI=n -AppVersionCode=103 -AppVersionName="1.03 - fixed monsters not shown on HTC G1" +AppVersionCode=104 +AppVersionName="1.04" CompiledLibraries="sdl_mixer" CustomBuildScript=n AppCflags='-O2 -finline-functions -Wno-write-strings' AppLdflags='' AppSubdirsBuild='' AppUseCrystaXToolchain=n +AppCmdline='' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/src b/project/jni/application/src index 104f796a6..299033683 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ballfield \ No newline at end of file +teeworlds \ No newline at end of file diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg index a41e05a71..35dc40acd 100644 --- a/project/jni/application/teeworlds/AndroidAppSettings.cfg +++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg @@ -1,5 +1,5 @@ # The application settings for Android libSDL port -AppSettingVersion=15 +AppSettingVersion=16 LibSdlVersion=1.2 AppName="TeeWorlds" AppFullName=com.teeworlds @@ -20,9 +20,10 @@ NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN LEFT RIGHT LSHIFT ESCAPE RSHIFT LSHIFT" AppTouchscreenKeyboardKeysAmount=6 AppTouchscreenKeyboardKeysAmountAutoFire=0 +RedefinedKeysScreenKb="SPACE RETURN LEFT RIGHT RSHIFT LSHIFT" MultiABI=y -AppVersionCode=5204 -AppVersionName="0.5.2.04" +AppVersionCode=5205 +AppVersionName="0.5.2.05" CompiledLibraries="sdl_image freetype" CustomBuildScript=n AppCflags='-O3'