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

Added several .gitignore files, small fix to XSDL

Browse Source
This commit is contained in:
Sergii Pylypenko
2014-07-01 21:11:58 +03:00
parent 0802c3ccee
commit ac4abb3d68
10 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/xserver/.gitignore vendored
View File

@@ -1 +1,3 @@
*.o
AndroidData/binaries-*
tmp-*

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

@@ -7,10 +7,10 @@ AppName="XServer XSDL"
AppFullName=x.org.server
# Application version code (integer)
AppVersionCode=11115
AppVersionCode=11116
# Application user-visible version name (string)
AppVersionName="1.11.15"
AppVersionName="1.11.16"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -21,7 +21,7 @@ AppVersionName="1.11.15"
AppDataDownloadUrl="!!Data files|:data.tar.gz:data-1.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^Additional fonts (90Mb)|:xfonts.tar.gz:http://sourceforge.net/projects/libsdl-android/files/apk/XServer-XSDL/xfonts.tgz/download"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y
ResetSdlConfigForThisVersion=n
# Delete application data files when upgrading (specify file/dir paths separated by spaces)
DeleteFilesOnUpgrade="%"

8
project/jni/application/xserver/main.c
View File

@@ -51,12 +51,10 @@ int main( int argc, char* argv[] )
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Actual video resolution %d/%dx%d/%d", resolutionW, displayW, resolutionH, displayH);
setupEnv();
SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_0, 0);
SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_1, 0);
SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_2, 0);
SDL_ANDROID_SetScreenKeyboardShown(0);
XSDL_initSDL();
XSDL_unpackFiles();
XSDL_showConfigMenu(&resolutionW, &displayW, &resolutionH, &displayH);
@@ -164,6 +162,8 @@ int main( int argc, char* argv[] )
argnum += 2;
}
SDL_ANDROID_SetScreenKeyboardShown(1);
if( screenButtons )
{
SDL_Rect pos;