Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

project/jni/application/openarena/AndroidAppSettings.cfg

@@ -5,7 +5,7 @@ AppName="OpenArena"
 AppFullName=ws.openarena.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Game data|http://sourceforge.net/projects/libsdl-android/files/OpenArena/oa-0.8.8-1.zip/download"
+AppDataDownloadUrl="!Game data|http://sourceforge.net/projects/libsdl-android/files/OpenArena/oa-0.8.8-1.zip/download^!Game logic|:baseoa/pak7-android.pk3:vm.zip"
 VideoDepthBpp=24
 NeedDepthBuffer=y
 NeedStencilBuffer=y
@@ -33,7 +33,7 @@ RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
-MultiABI=n
+MultiABI=y
 AppVersionCode=08803
 AppVersionName="0.8.8.03"
 ResetSdlConfigForThisVersion=n

project/jni/application/openarena/AndroidBuild.sh

@@ -3,8 +3,17 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
-../setEnvironment.sh make -j8 -C engine release \
-PLATFORM=android ARCH=arm USE_GLES=1 USE_LOCAL_HEADERS=0 \
+../setEnvironment-$1.sh make -j8 -C engine release \
+PLATFORM=android ARCH=$1 USE_GLES=1 USE_LOCAL_HEADERS=0 \
 USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=1 USE_MUMBLE=0 USE_FREETYPE=1 \
-USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 &&
-mv -f engine/build/release-android-arm/openarena.arm libapplication.so
+USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 && \
+echo "Copying engine/build/release-android-$1/openarena.$1 -> libapplication-$1.so" && \
+cp -f engine/build/release-android-$1/openarena.$1 libapplication-$1.so
+
+[ "$1" = "armeabi" ] && (
+[ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
+make -j8 -C vm
+cd vm/build/release-*/baseq3
+zip -r vm.zip vm
+cmp -s vm.zip ../../../../AndroidData/vm.zip || mv -f vm.zip ../../../../AndroidData/vm.zip
+)