paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix Android build scripts.

Browse Source 
This was SVN commit r11153.
This commit is contained in:
Ykkrosh 2012-02-25 16:11:08 +00:00
parent bc805bd357
commit b104bec238
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/android/sdl-project/AndroidManifest.xml
View File

@ -4,6 +4,7 @@
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
<application android:label="@string/app_name"

2
build/android/sdl-project/Makefile
View File

@ -1,5 +1,5 @@
ANDROID=${HOME}/android
NDK=${ANDROID}/android-ndk-r7-crystax-4
NDK=${ANDROID}/android-ndk-r7-crystax-5.beta2
SDK=${ANDROID}/android-sdk-linux
TOOLCHAIN=${ANDROID}/toolchain-0ad
SYSROOT=${TOOLCHAIN}/sysroot

8
build/android/setup-libs.sh
View File

@ -4,7 +4,7 @@ set -e
set -o nounset
ANDROID=$HOME/android
NDK=$ANDROID/android-ndk-r7-crystax-4
NDK=$ANDROID/android-ndk-r7-crystax-5.beta2
SDK=$ANDROID/android-sdk-linux
TOOLCHAIN=$ANDROID/toolchain-0ad
@ -106,9 +106,9 @@ if [ "$build_curl" = "true" ]; then
fi
if [ "$build_libpng" = "true" ]; then
rm -rf temp/libpng-1.5.7
tar xvf files/libpng-1.5.7.tar.xz -C temp/
pushd temp/libpng-1.5.7
rm -rf temp/libpng-1.5.8
tar xvf files/libpng-1.5.8.tar.xz -C temp/
pushd temp/libpng-1.5.8
./configure --host=arm-linux-eabi --with-sysroot=$SYSROOT --prefix=$SYSROOT/usr/local CFLAGS="$CFLAGS"
make $JOBS
make install