From d5ef5ffd5986e7ee345e92f1152de3f1fc34b3ad Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 9 Feb 2011 11:52:22 +0000 Subject: [PATCH] Updated Dosbox projects (thanks to Lubomyr) --- .../application/dosbox/AndroidAppSettings.cfg | 14 +++++++------- .../jni/application/dosbox/AndroidBuild.sh | 2 ++ .../dosbox/AndroidData/dosbox-data.zip | Bin 247706 -> 248654 bytes 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/project/jni/application/dosbox/AndroidAppSettings.cfg b/project/jni/application/dosbox/AndroidAppSettings.cfg index 1f4f0d669..be4c1d3ca 100644 --- a/project/jni/application/dosbox/AndroidAppSettings.cfg +++ b/project/jni/application/dosbox/AndroidAppSettings.cfg @@ -17,18 +17,18 @@ AppUsesJoystick=n AppHandlesJoystickSensitivity=n AppUsesMultitouch=n NonBlockingSwapBuffers=n -RedefinedKeys="LCTRL RETURN KP_PLUS KP_MINUS LCTRL" -AppTouchscreenKeyboardKeysAmount=0 +RedefinedKeys="SPACE RETURN PLUS MINUS F11 ESCAPE F5 F6 F7 F8" +AppTouchscreenKeyboardKeysAmount=4 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="LCTRL RETURN KP_PLUS KP_MINUS LCTRL" +RedefinedKeysScreenKb="F11 F12 F9 F10" MultiABI=n -AppVersionCode=07401 -AppVersionName="0.74.01" -CompiledLibraries="jpeg png" +AppVersionCode=07402 +AppVersionName="0.74.02" +CompiledLibraries="jpeg png sdl_mixer sdl_net sdl_sound" CustomBuildScript=y AppCflags='' AppLdflags='' AppSubdirsBuild='' -AppUseCrystaXToolchain=y +AppUseCrystaXToolchain=n AppCmdline='' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/dosbox/AndroidBuild.sh b/project/jni/application/dosbox/AndroidBuild.sh index 9cea37b77..c4079d511 100755 --- a/project/jni/application/dosbox/AndroidBuild.sh +++ b/project/jni/application/dosbox/AndroidBuild.sh @@ -5,6 +5,8 @@ LOCAL_PATH=`dirname $0` LOCAL_PATH=`cd $LOCAL_PATH && pwd` ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so +ln -sf libsdl_net.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_net.so +ln -sf libsdl_sound.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_sound.so if [ \! -f dosbox-0.74/configure ] ; then sh -c "cd dosbox-0.74 && ./autogen.sh" diff --git a/project/jni/application/dosbox/AndroidData/dosbox-data.zip b/project/jni/application/dosbox/AndroidData/dosbox-data.zip index 56c1c180dd0704e5578df3d283a2eb8ca0409547..9b0f8e2f9cbd46f842f2373f5db18571a4a3bc49 100644 GIT binary patch delta 5240 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