diff --git a/copyAssets.sh b/copyAssets.sh index d5bb9aa8d..9419c67e7 100755 --- a/copyAssets.sh +++ b/copyAssets.sh @@ -4,7 +4,7 @@ echo "Copying app data files from project/jni/application/src/AndroidData to pro mkdir -p project/assets rm -f project/assets/* if [ -d "project/jni/application/src/AndroidData" ] ; then - cp project/jni/application/src/AndroidData/* project/assets/ + cp -L project/jni/application/src/AndroidData/* project/assets/ exit 0 for F in project/assets/*; do if [ `cat $F | wc -c` -gt 1000000 ] ; then diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index b7e22ef00..0a5119e0e 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -23,7 +23,7 @@ InhibitSuspend=n # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!Data files|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/dist-debug-wheezy-armhf-gimp.tar.gz/download^!!Data files|:busybox:busybox^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf" +AppDataDownloadUrl="!!Data files|:data.tar.gz:http://10.0.0.99/dist-debug-wheezy-armhf-gimp.tar.gz|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/dist-debug-wheezy-armhf-gimp.tar.gz/download^!!Data files|:busybox:busybox^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf" # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) @@ -209,7 +209,7 @@ AppSubdirsBuild='' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='XSDL -nohelp /data/data/org.gimp.inkscape/files/chroot.sh bin/sh -c ./start-gimp.sh' +AppCmdline='XSDL -nohelp /data/data/org.gimp.inkscape/files/chroot.sh bin/bash usr/bin/fakeroot-sysv ./start-gimp.sh' # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?) diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index 28b4cc222..ba76adaec 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -28,6 +28,7 @@ int main( int argc, char* argv[] ) "-exec", clientcmd }; + enum { ARGNUM = 8 }; char * envp[] = { NULL }; int printHelp = 1; @@ -90,7 +91,9 @@ int main( int argc, char* argv[] ) getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR") ); } - __android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL video resolution %s", screenres); + __android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL video resolution %s, args:", screenres); + for( i = 0; i < ARGNUM; i++ ) + __android_log_print(ANDROID_LOG_INFO, "XSDL", "> %s", args[i]); - return android_main( 8, args, envp ); + return android_main( ARGNUM, args, envp ); }