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

Fixed OpenArena compilation

Browse Source
This commit is contained in:
pelya
2012-10-01 19:01:00 +03:00
parent fba7f6123f
commit 609e9f9bb5
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
project/jni/application/openarena/AndroidBuild.sh
View File

@@ -3,13 +3,6 @@
LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
../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 && \
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
@@ -17,3 +10,11 @@ cd vm/build/release-*/baseq3
zip -r vm.zip vm
cmp -s vm.zip ../../../../AndroidData/vm.zip || mv -f vm.zip ../../../../AndroidData/vm.zip
)
../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 && \
echo "Copying engine/build/release-android-$1/openarena.$1 -> libapplication-$1.so" && \
cp -f engine/build/release-android-$1/openarena.$1 libapplication-$1.so && \
exit 0

BIN
project/jni/application/openarena/AndroidData/vm.zip
View File

Binary file not shown.

1
project/jni/application/openarena/readme.txt
View File

@@ -3,6 +3,7 @@ Download SDL Git repo from https://github.com/pelya/commandergenius,
install latest Android SDK, Android NDK r8b or newer, and "ant" tool (sudo apt-get install ant),
then launch commands:
git submodule update --init project/jni/application/openarena/engine
git submodule update --init project/jni/application/openarena/vm
rm project/jni/application/src # ignore the error
ln -s openarena project/jni/application/src
./ChangeAppSettings.sh -a

6
project/jni/application/openttd/AndroidAppSettings.cfg
View File

@@ -34,9 +34,9 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=12221
AppVersionName="1.2.2.21"
ResetSdlConfigForThisVersion=y
AppVersionCode=12222
AppVersionName="1.2.2.22"
ResetSdlConfigForThisVersion=n
DeleteFilesOnUpgrade=".openttd/openttd.cfg"
CompiledLibraries="jpeg png freetype timidity lzma lzo2"
CustomBuildScript=y