From bb94c54b8e1679fad81acf612e188c025db3cf17 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 23 Nov 2010 18:54:14 +0200 Subject: [PATCH] Added VICE project files to Git - it crashes at random! --- project/jni/application/src | 2 +- .../application/vice/AndroidAppSettings.cfg | 33 ++++++++++++++++++ project/jni/application/vice/AndroidBuild.sh | 17 +++++++++ project/jni/application/vice/icon.png | Bin 0 -> 6106 bytes project/jni/application/vice/readme.txt | 2 ++ project/jni/application/vice/vice | 1 + .../src/video/android/SDL_androidvideo-1.2.c | 6 ++-- project/jni/sdl_main/sdl_main.c | 8 +++-- 8 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 project/jni/application/vice/AndroidAppSettings.cfg create mode 100755 project/jni/application/vice/AndroidBuild.sh create mode 100644 project/jni/application/vice/icon.png create mode 100644 project/jni/application/vice/readme.txt create mode 120000 project/jni/application/vice/vice diff --git a/project/jni/application/src b/project/jni/application/src index 59d41f41e..1530582ff 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -fheroes2 \ No newline at end of file +vice \ No newline at end of file diff --git a/project/jni/application/vice/AndroidAppSettings.cfg b/project/jni/application/vice/AndroidAppSettings.cfg new file mode 100644 index 000000000..2663cc217 --- /dev/null +++ b/project/jni/application/vice/AndroidAppSettings.cfg @@ -0,0 +1,33 @@ +# The application settings for Android libSDL port +AppSettingVersion=15 +LibSdlVersion=1.2 +AppName="ViceC64" +AppFullName=org.viceteam.sdl +ScreenOrientation=h +InhibitSuspend=n +AppDataDownloadUrl="Data files size is 1 Mb|http://anddev.at.ua/data/vice-data.zip?attredirects=0&d=1" +SdlVideoResize=y +SdlVideoResizeKeepAspect=n +NeedDepthBuffer=n +AppUsesMouse=n +AppNeedsTwoButtonMouse=n +AppNeedsArrowKeys=y +AppNeedsTextInput=y +AppUsesJoystick=n +AppHandlesJoystickSensitivity=n +AppUsesMultitouch=n +NonBlockingSwapBuffers=n +RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS LCTRL" +AppTouchscreenKeyboardKeysAmount=3 +AppTouchscreenKeyboardKeysAmountAutoFire=0 +MultiABI=n +AppVersionCode=12001 +AppVersionName="2.2.01" +CompiledLibraries="jpeg png" +CustomBuildScript=y +AppCflags='' +AppLdflags='' +AppSubdirsBuild='' +AppUseCrystaXToolchain=n +AppCmdline='/sdcard/app-data/org.viceteam.sdl/vice -sdlcustomw 480 -sdlcustomh 320 -sdllimitmode 1 -menukey 306' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/vice/AndroidBuild.sh b/project/jni/application/vice/AndroidBuild.sh new file mode 100755 index 000000000..bcbb0eedb --- /dev/null +++ b/project/jni/application/vice/AndroidBuild.sh @@ -0,0 +1,17 @@ +#!/bin/sh + + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so + +if [ \! -f vice/configure ] ; then + sh -c "cd vice && ./autogen.sh" +fi + +if [ \! -f vice/Makefile ] ; then + ../setEnvironment.sh sh -c "cd vice && ./configure --host=arm-eabi --without-x --enable-sdlui --with-sdlsound --without-resid" +fi + +make -C vice && mv -f vice/src/x64 libapplication.so diff --git a/project/jni/application/vice/icon.png b/project/jni/application/vice/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d67d70b87ea7cb1955b311086c5f0327ca20c097 GIT binary patch literal 6106 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 literal 0 HcmV?d00001 diff --git a/project/jni/application/vice/readme.txt b/project/jni/application/vice/readme.txt new file mode 100644 index 000000000..114006ebd --- /dev/null +++ b/project/jni/application/vice/readme.txt @@ -0,0 +1,2 @@ +Download VICE from https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/vice , +put or symlink it here under dir name "vice", and hit build.sh. diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice new file mode 120000 index 000000000..3756e5e02 --- /dev/null +++ b/project/jni/application/vice/vice @@ -0,0 +1 @@ +../../../../../vice \ No newline at end of file diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index b53d7eb00..02f61f06c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c @@ -100,7 +100,7 @@ static void ANDROID_UpdateRects(_THIS, int numrects, SDL_Rect *rects); /* Private display data */ -#define SDL_NUMMODES 9 +#define SDL_NUMMODES 10 static SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; //#define SDL_modelist (this->hidden->SDL_modelist) @@ -233,12 +233,14 @@ int ANDROID_VideoInit(_THIS, SDL_PixelFormat *vformat) SDL_modelist[3]->w = 640; SDL_modelist[3]->h = 400; // Will likely be shrinked SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240; // Always available on any screen and any orientation SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200; // Always available on any screen and any orientation - SDL_modelist[6]->w = 256; SDL_modelist[6]->h = 224; // Always available on any screen and any orientation + SDL_modelist[6]->w = 256; SDL_modelist[6]->h = 224; // For REminiscence SDL_modelist[7]->w = SDL_ANDROID_sWindowWidth * 2 / 3; SDL_modelist[7]->h = SDL_ANDROID_sWindowHeight * 2 / 3; SDL_modelist[8]->w = SDL_ANDROID_sWindowWidth / 2; SDL_modelist[8]->h = SDL_ANDROID_sWindowHeight / 2; SDL_modelist[9] = NULL; + //SDL_modelist[9]->w = 533; SDL_modelist[9]->h = 320; // For VICE + //SDL_modelist[10] = NULL; SDL_VideoInit_1_3(NULL, 0); diff --git a/project/jni/sdl_main/sdl_main.c b/project/jni/sdl_main/sdl_main.c index 76e2ddf7d..6c1bb540d 100644 --- a/project/jni/sdl_main/sdl_main.c +++ b/project/jni/sdl_main/sdl_main.c @@ -30,7 +30,7 @@ extern C_LINKAGE void JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring cmdline ) { int i = 0; - char curdir[512]; + char curdir[512], realcurdir[512]; const jbyte *jstr; const char * str = "sdl"; int argc = 0; @@ -47,8 +47,10 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring strcat(curdir, SDL_CURDIR_PATH); strcat(curdir, "/files"); } - chdir(curdir); - setenv("HOME", curdir, 1); + if( realpath(curdir, realcurdir) == NULL ) + strcpy(realcurdir, curdir); + chdir(realcurdir); + setenv("HOME", realcurdir, 1); jstr = (*env)->GetStringUTFChars(env, cmdline, NULL);