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

Setting some env variables like app path and display physical size

Browse Source
This commit is contained in:
pelya
2012-10-21 22:09:48 +03:00
parent 429d0e3925
commit 380a732f52
10 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ AppUsesMouse=n
AppNeedsTwoButtonMouse=n
ShowMouseCursor=n
ForceRelativeMouseMode=n
AppNeedsArrowKeys=n
AppNeedsArrowKeys=y
AppNeedsTextInput=y
AppUsesJoystick=y
AppUsesAccelerometer=y
@@ -33,10 +33,10 @@ RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=0880301
MultiABI=y
AppVersionCode=08803
AppVersionName="0.8.8.03"
ResetSdlConfigForThisVersion=n
ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade="libsdl-DownloadFinished-1.flag"
CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
CustomBuildScript=y
@@ -46,6 +46,6 @@ AppSubdirsBuild=''
AppCmdline=''
ReadmeText='^Readme text'
MinimumScreenSize=n
AdmobPublisherId=a14fe4dd0ebe974
AdmobPublisherId=n #a14fe4dd0ebe974
AdmobTestDeviceId=66133194946FB6C1CD0ED2EFCCB82539
AdmobBannerSize=BANNER

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

@@ -5,16 +5,23 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
[ "$1" = "armeabi" ] && (
[ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
make -j8 -C vm BUILD_MISSIONPACK=0
make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1
cd vm/build/release-linux-`uname -m`/baseq3
rm -f ../../../../AndroidData/binaries.zip
cd baseq3
zip -r vm.zip vm
cmp -s vm.zip ../../../../AndroidData/vm.zip || mv -f vm.zip ../../../../AndroidData/vm.zip
)
env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-armeabi.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1
../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so"
../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 && \
cp -f engine/build/release-android-$1/openarena.$1 libapplication-$1.so || exit 1
exit 0

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

Binary file not shown.

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: c98bcf9eea...687cdf8ab7

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 8ffdaa479d...dc740d594f

9
project/jni/application/vcmi/Makefile
View File

@@ -24,14 +24,9 @@ OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp)
OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM))
all: AndroidData/vcmiserver0
all: AndroidData/binaries.zip
AndroidData/vcmiserver0: vcmiserver.zip
rm -f AndroidData/vcmiserver*
split -b 1048576 -d -a 1 $< AndroidData/vcmiserver
cp -f AndroidData/vcmiserver* ../../../assets
vcmiserver.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripting/libvcmiERM.so
AndroidData/binaries.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripting/libvcmiERM.so
rm -f $@
zip -r $@ $^

24
project/jni/sdl_main/sdl_main.c
View File

@@ -1,5 +1,3 @@
#ifdef ANDROID
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
@@ -46,10 +44,15 @@ jobject SDL_ANDROID_JniVideoObject()
extern void SDL_ANDROID_MultiThreadedVideoLoopInit();
extern void SDL_ANDROID_MultiThreadedVideoLoop();
static int threadedMain(void * unused);
static int threadedMain(void * waitForDebugger);
int threadedMain(void * unused)
int threadedMain(void * waitForDebugger)
{
if( waitForDebugger )
{
//__android_log_print(ANDROID_LOG_INFO, "libSDL", "We are being debugged - waiting for debugger for 7 seconds");
//usleep(7000000);
}
SDL_main( argc, argv );
__android_log_print(ANDROID_LOG_INFO, "libSDL", "Application closed, calling exit(0)");
exit(0);
@@ -57,7 +60,7 @@ int threadedMain(void * unused)
#endif
extern C_LINKAGE void
JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring jcurdir, jstring cmdline, jint multiThreadedVideo )
JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring jcurdir, jstring cmdline, jint multiThreadedVideo, jint waitForDebugger )
{
int i = 0;
char curdir[PATH_MAX] = "";
@@ -123,14 +126,19 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring
SDL_main( argc, argv );
#else
if( ! multiThreadedVideo )
{
if( waitForDebugger )
{
//__android_log_print(ANDROID_LOG_INFO, "libSDL", "We are being debugged - waiting for debugger for 7 seconds");
//usleep(7000000);
}
SDL_main( argc, argv );
}
else
{
SDL_ANDROID_MultiThreadedVideoLoopInit();
SDL_CreateThread(threadedMain, NULL);
SDL_CreateThread(threadedMain, (void *)waitForDebugger);
SDL_ANDROID_MultiThreadedVideoLoop();
}
#endif
};
#endif