diff --git a/.gitignore b/.gitignore index 0443ffd12..7be49a15c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,5 @@ project/src project/res/values* project/AndroidManifest.xml project/jni/Settings.mk -libapplication.so +project/jni/application/*/libapplication*.so project/jni/application/src diff --git a/createSourceArchive.sh b/createSourceArchive.sh new file mode 100755 index 000000000..abfad1f04 --- /dev/null +++ b/createSourceArchive.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +APPNAME=`grep AppName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` +APPVER=`grep AppVersionName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` + +# TODO: Boost and Python are stored in repository as precompiled binaries, the proper way to fix that is to build them using scripts, and remove that binaries +tar -c -z --exclude-vcs --exclude="*.o" --exclude="*.a" --exclude="*.so" --exclude="*.d" --exclude="*.dep" \ +-f $APPNAME-$APPVER-src.tar.gz \ +`git ls-files --exclude-standard | grep -v '^project/jni/application/.*'` \ +`find project/jni/application -maxdepth 1 -type f` \ +project/jni/application/src \ +project/jni/application/`readlink project/jni/application/src` \ +project/AndroidManifest.xml project/src diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index e6a1c6ded..6961c56e0 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -17,6 +17,7 @@ CompatibilityHacks=n CompatibilityHacksStaticInit=n CompatibilityHacksTextInputEmulatesHwKeyboard=y CompatibilityHacksPreventAudioChopping=n +CompatibilityHacksAppIgnoresAudioBufferSize=n AppUsesMouse=y AppNeedsTwoButtonMouse=y ShowMouseCursor=n diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 7a939ba4d..1f9e463ad 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 7a939ba4da141482411f6330c4606b6ddfe114a8 +Subproject commit 1f9e463ad398d134d3122b709013f5b47575301b