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

Minor fix to data downloader, updated OpenArena project

Browse Source
This commit is contained in:
pelya
2012-08-03 16:34:43 +03:00
parent 89400e5fe1
commit 64cd8c425a
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/openarena/AndroidAppSettings.cfg
View File

@@ -5,7 +5,7 @@ AppName="OpenArena"
AppFullName=ws.openarena.sdl
ScreenOrientation=h
InhibitSuspend=n
AppDataDownloadUrl="Game data|http://10.0.2.2/up/oa-0.8.8-1.zip"
AppDataDownloadUrl="Game data|http://172.17.57.25/oa-0.8.8-1.zip|http://10.0.2.2/up/oa-0.8.8-1.zip"
VideoDepthBpp=24
NeedDepthBuffer=y
NeedStencilBuffer=y
@@ -31,7 +31,7 @@ AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig'
HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=101

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

@@ -4,7 +4,7 @@ LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
../setEnvironment.sh make -j8 -C engine \
PLATFORM=android ARCH=arm USE_LOCAL_HEADERS=0 \
PLATFORM=android ARCH=arm USE_GLES=1 USE_LOCAL_HEADERS=0 \
USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=0 USE_MUMBLE=0 USE_FREETYPE=1 \
USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 HAVE_VM_COMPILED=1 &&
mv -f engine/build/release-android-arm/openarena.arm libapplication.so

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: ddeec4e863...7e290b68a5

3
project/jni/application/setEnvironment-r5b.sh
View File

@@ -52,7 +52,6 @@ MISSING_LIB=
#fi
CFLAGS="\
-fexceptions -frtti \
-fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi \
-march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
@@ -94,7 +93,7 @@ $MISSING_LIB $LDFLAGS"
env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
CFLAGS="$CFLAGS" \
CXXFLAGS="$CFLAGS" \
CXXFLAGS="-fexceptions -frtti $CFLAGS" \
LDFLAGS="$LDFLAGS" \
CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \

3
project/jni/application/setEnvironment-r8b.sh
View File

@@ -44,7 +44,6 @@ MISSING_INCLUDE=
MISSING_LIB=
CFLAGS="\
-fexceptions -frtti \
-fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi \
-march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
@@ -86,7 +85,7 @@ $MISSING_LIB $LDFLAGS"
env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
CFLAGS="$CFLAGS" \
CXXFLAGS="$CFLAGS" \
CXXFLAGS="-fexceptions -frtti $CFLAGS" \
LDFLAGS="$LDFLAGS" \
CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \