diff --git a/project/jni/application/xserver-debian/AndroidPreBuild.sh b/project/jni/application/xserver-debian/AndroidPreBuild.sh index 9d3924cd3..ebe88be2d 120000 --- a/project/jni/application/xserver-debian/AndroidPreBuild.sh +++ b/project/jni/application/xserver-debian/AndroidPreBuild.sh @@ -1 +1 @@ -../xserver-gimp/AndroidPreBuild.sh \ No newline at end of file +../xserver/AndroidPreBuild.sh \ No newline at end of file diff --git a/project/jni/application/xserver-debian/ultimatedroid.raw b/project/jni/application/xserver-debian/ultimatedroid.raw deleted file mode 120000 index d6de9e0d4..000000000 --- a/project/jni/application/xserver-debian/ultimatedroid.raw +++ /dev/null @@ -1 +0,0 @@ -../xserver-gimp/ultimatedroid.raw \ No newline at end of file diff --git a/project/jni/application/xserver-debian/xsdl.raw b/project/jni/application/xserver-debian/xsdl.raw new file mode 120000 index 000000000..ad035dada --- /dev/null +++ b/project/jni/application/xserver-debian/xsdl.raw @@ -0,0 +1 @@ +../xserver/xsdl.raw \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/.gitignore b/project/jni/application/xserver-gimp/.gitignore deleted file mode 120000 index ac0ff339c..000000000 --- a/project/jni/application/xserver-gimp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -../xserver/.gitignore \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg deleted file mode 100644 index d8454fc8f..000000000 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ /dev/null @@ -1,269 +0,0 @@ -# The application settings for Android libSDL port - -# Specify application name (e.x. My Application) -AppName="GIMP Inkscape" - -# Specify reversed site name of application (e.x. com.mysite.myapp) -AppFullName=org.gimp.inkscape - -# Application version code (integer) -AppVersionCode=281427 - -# Application user-visible version name (string) -AppVersionName="2.8.14.27" - -# 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 -# If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped -# 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 -# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.281420|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-gimp-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1.tgz^!!Update 2|:update2.tar.gz:update2-.tgz^!!Update 3|:update3.tar.gz:update3.tgz^!!Update 4|:update4.tar.gz:update4-.tgz" - -# Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n - -# Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="" - -# Here you may type readme text, which will be shown during startup. Format is: -# Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ -ReadmeText='' - -# libSDL version to use (1.2/1.3/2.0) -LibSdlVersion=1.2 - -# Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape -ScreenOrientation=h - -# 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) -VideoDepthBpp=16 - -# Enable OpenGL depth buffer (needed only for 3-d applications, small speed decrease) (y) or (n) -NeedDepthBuffer=n - -# Enable OpenGL stencil buffer (needed only for 3-d applications, small speed decrease) (y) or (n) -NeedStencilBuffer=n - -# Try to use GLES 2.x context - will revert to GLES 1.X if unsupported by device -# you need this option only if you're developing 3-d app (y) or (n) -NeedGles2=n - -# Application uses software video buffer - you're calling SDL_SetVideoMode() without SDL_HWSURFACE and without SDL_OPENGL, -# this will allow small speed optimization. Enable this even when you're using SDL_HWSURFACE. (y) or (n) -SwVideoMode=y - -# Application video output will be resized to fit into native device screen (y)/(n) -SdlVideoResize=y - -# Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) -SdlVideoResizeKeepAspect=n - -# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer -InhibitSuspend=y - -# Create Android service, so the app is less likely to be killed while in background -CreateService=y - -# Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread - -# enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n) -CompatibilityHacksForceScreenUpdate=n - -# Application does not call SDL_Flip() or SDL_UpdateRects() after mouse click (ScummVM and all Amiga emulators do that) - -# force screen update by moving mouse cursor a little after each click (y) or (n) -CompatibilityHacksForceScreenUpdateMouseClick=y - -# Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) -CompatibilityHacksStaticInit=n - -# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n) -CompatibilityHacksTextInputEmulatesHwKeyboard=y - -# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n) -CompatibilityHacksPreventAudioChopping=n - -# Hack for broken apps: application ignores audio buffer size returned by SDL (y)/(n) -CompatibilityHacksAppIgnoresAudioBufferSize=n - -# Hack for VCMI: preload additional shared libraries before aplication start -CompatibilityHacksAdditionalPreloadedSharedLibraries="" - -# Hack for Free Heroes 2, which redraws the screen inside SDL_PumpEvents(): slow and compatible SDL event queue - -# do not use it with accelerometer/gyroscope, or your app may freeze at random (y)/(n) -CompatibilityHacksSlowCompatibleEventQueue=n - -# Save and restore OpenGL state when drawing on-screen keyboard for apps that use SDL_OPENGL -CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState= - -# Application uses SDL_UpdateRects() properly, and does not draw in any region outside those rects. -# This improves drawing speed, but I know only one application that does that, and it's written by me (y)/(n) -CompatibilityHacksProperUsageOfSDL_UpdateRects=y - -# Application uses mouse (y) or (n), this will show mouse emulation dialog to the user -AppUsesMouse=y - -# Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n) -AppNeedsTwoButtonMouse=y - -# Right mouse button can do long-press/drag&drop action, necessary for some games (y) or (n) -# If you disable it, swiping with two fingers will send mouse wheel events -RightMouseButtonLongPress=n - -# Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) -ShowMouseCursor=n - -# Screen follows mouse cursor, when it's covered by soft keyboard, this works only in software video mode (y) or (n) -ScreenFollowsMouse=y - -# Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n) -GenerateSubframeTouchEvents=y - -# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n) -ForceRelativeMouseMode=y - -# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n) -AppNeedsArrowKeys=n - -# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n) -# Joystick always follows finger, so moving mouse requires touching the screen with other finger -FloatingScreenJoystick= - -# Application needs text input (y) or (n), enables button for text input on screen -AppNeedsTextInput=n - -# Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1 -# This will disable AppNeedsArrowKeys option -AppUsesJoystick=n - -# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n) -AppUsesSecondJoystick=n - -# Application uses third on-screen joystick, as SDL joystick 0 axes 20-21 (y)/(n) -AppUsesThirdJoystick= - -# Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7 -AppUsesAccelerometer=n - -# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 -AppUsesGyroscope=n - -# Use gyroscope to move mouse cursor (y) or (n), it eats battery, and can be disabled in settings, do not use with AppUsesGyroscope setting -MoveMouseWithGyroscope=y - -# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 -AppUsesMultitouch=y - -# Application records audio (it will use any available source, such a s microphone) -# API is defined in file SDL_android.h: int SDL_ANDROID_OpenAudioRecording(SDL_AudioSpec *spec); void SDL_ANDROID_CloseAudioRecording(void); -# This option will add additional permission to Android manifest (y)/(n) -AppRecordsAudio=n - -# Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n) -AccessSdCard=y - -# Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) -AccessInternet= - -# Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) -ImmersiveMode=y - -# Application implements Android-specific routines to put to background, and will not draw anything to screen -# between SDL_ACTIVEEVENT lost / gained notifications - you should check for them -# rigth after SDL_Flip(), if (n) then SDL_Flip() will block till app in background (y) or (n) -# This option is reported to be buggy, sometimes failing to restore video state -NonBlockingSwapBuffers=n - -# Redefine common hardware keys to SDL keysyms -# BACK hardware key is available on all devices, MENU is available on pre-ICS devices, other keys may be absent -# SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices -# Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) -# Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA -RedefinedKeys="LALT UNDO NO_REMAP NO_REMAP UNDO HELP" - -# Number of virtual keyboard keys (currently 6 is maximum) -AppTouchscreenKeyboardKeysAmount=3 - -# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" - -# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu -RedefinedKeysScreenKbNames="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" - -# On-screen keys theme -# 0 = Ultimate Droid by Sean Stieber (green, with cross joystick) -# 1 = Simple Theme by Beholder (white, with cross joystick) -# 2 = Sun by Sirea (yellow, with round joystick) -# 3 = Keen by Gerstrong (multicolor, with round joystick) -# 4 = Retro by Santiago Radeff (red/white, with cross joystick) -TouchscreenKeysTheme=0 - -# Redefine gamepad keys to SDL keysyms, button order is: -# A B X Y L1 R1 L2 R2 LThumb RThumb -RedefinedKeysGamepad="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" - -# How long to show startup menu button, in msec, 0 to disable startup menu -StartupMenuButtonTimeout=3000 - -# Menu items to hide from startup menu, available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced -HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig' - -# Menu items to show at startup - this is Java code snippet, leave empty for default -# new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration() -# Available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced -FirstStartMenuOptions='' - -# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower -AppMinimumRAM=0 - -# GCC version, 4.6 (default) or 4.8, CLANG is not supported yet -NDK_TOOLCHAIN_VERSION= - -# Specify architectures to compile, 'all' or 'y' to compile for all architectures. -# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a x86' - -# Optional shared libraries to compile - removing some of them will save space -# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed -# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="jpeg png freetype sdl_ttf" - -# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) -CustomBuildScript=y - -# Aditional CFLAGS for application -AppCflags='' - -# Additional LDFLAGS for application -AppLdflags='' - -# If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable -AppOverlapsSystemHeaders= - -# Build only following subdirs (empty will build all dirs, ignored with custom script) -AppSubdirsBuild='' - -# Exclude these files from build -AppBuildExclude='' - -# Application command line parameters, including app name as 0-th param -AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1750 -exec $SECURE_STORAGE_DIR/usr/bin/xli -onroot -border black -center $UNSECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' - -# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens -# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge -MinimumScreenSize=m - -# Your AdMob Publisher ID, (n) if you don't want advertisements -AdmobPublisherId=n - -# Your AdMob test device ID, to receive a test ad -AdmobTestDeviceId= - -# Your AdMob banner size (BANNER/FULL_BANNER/LEADERBOARD/MEDIUM_RECTANGLE/SMART_BANNER/WIDE_SKYSCRAPER/FULL_WIDTH:Height/Width:AUTO_HEIGHT/Width:Height) -AdmobBannerSize= - -# Google Play Game Services application ID, required for cloud saves to work -GooglePlayGameServicesId= - diff --git a/project/jni/application/xserver-gimp/AndroidBuild.sh b/project/jni/application/xserver-gimp/AndroidBuild.sh deleted file mode 120000 index 894909421..000000000 --- a/project/jni/application/xserver-gimp/AndroidBuild.sh +++ /dev/null @@ -1 +0,0 @@ -../xserver/AndroidBuild.sh \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/DroidSansMono.ttf b/project/jni/application/xserver-gimp/AndroidData/DroidSansMono.ttf deleted file mode 120000 index 0cfbee59b..000000000 --- a/project/jni/application/xserver-gimp/AndroidData/DroidSansMono.ttf +++ /dev/null @@ -1 +0,0 @@ -../../xserver/AndroidData/DroidSansMono.ttf \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/data-1.tgz b/project/jni/application/xserver-gimp/AndroidData/data-1.tgz deleted file mode 120000 index 2a2d243ac..000000000 --- a/project/jni/application/xserver-gimp/AndroidData/data-1.tgz +++ /dev/null @@ -1 +0,0 @@ -../xserver/data/data-1.tgz \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/loading.gif b/project/jni/application/xserver-gimp/AndroidData/loading.gif deleted file mode 100644 index cee805831..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/loading.gif and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/logo.png b/project/jni/application/xserver-gimp/AndroidData/logo.png deleted file mode 100644 index a4ac722e0..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/logo.png and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/postinstall.sh b/project/jni/application/xserver-gimp/AndroidData/postinstall.sh deleted file mode 120000 index 75c50e5c5..000000000 --- a/project/jni/application/xserver-gimp/AndroidData/postinstall.sh +++ /dev/null @@ -1 +0,0 @@ -../../xserver-debian/AndroidData/postinstall.sh \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/update1.tgz b/project/jni/application/xserver-gimp/AndroidData/update1.tgz deleted file mode 100644 index ac0695e62..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update1.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update2-armeabi-v7a.tgz b/project/jni/application/xserver-gimp/AndroidData/update2-armeabi-v7a.tgz deleted file mode 100644 index 47d793c05..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update2-armeabi-v7a.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update2-x86.tgz b/project/jni/application/xserver-gimp/AndroidData/update2-x86.tgz deleted file mode 100644 index 3856da2ed..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update2-x86.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update3.tgz b/project/jni/application/xserver-gimp/AndroidData/update3.tgz deleted file mode 100644 index 8b4878b73..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update3.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update4-armeabi-v7a.tgz b/project/jni/application/xserver-gimp/AndroidData/update4-armeabi-v7a.tgz deleted file mode 100644 index 017a95c25..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update4-armeabi-v7a.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update4-x86.tgz b/project/jni/application/xserver-gimp/AndroidData/update4-x86.tgz deleted file mode 100644 index 4ed27de18..000000000 Binary files a/project/jni/application/xserver-gimp/AndroidData/update4-x86.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidPreBuild.sh b/project/jni/application/xserver-gimp/AndroidPreBuild.sh deleted file mode 100755 index bb42e5e35..000000000 --- a/project/jni/application/xserver-gimp/AndroidPreBuild.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cp -f ultimatedroid.raw ../../../res/raw/ diff --git a/project/jni/application/xserver-gimp/createSourceArchive.sh b/project/jni/application/xserver-gimp/createSourceArchive.sh deleted file mode 100755 index cfa605ce4..000000000 --- a/project/jni/application/xserver-gimp/createSourceArchive.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -CURDIR=`pwd` -CURDIR=`realpath $CURDIR` -cd $CURDIR/../../../../ -./createSourceArchive.sh project/jni/application/xserver project/jni/application/xserver-debian diff --git a/project/jni/application/xserver-gimp/gfx.c b/project/jni/application/xserver-gimp/gfx.c deleted file mode 120000 index ccab9cb4c..000000000 --- a/project/jni/application/xserver-gimp/gfx.c +++ /dev/null @@ -1 +0,0 @@ -../xserver/gfx.c \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/gfx.h b/project/jni/application/xserver-gimp/gfx.h deleted file mode 120000 index 75e09da82..000000000 --- a/project/jni/application/xserver-gimp/gfx.h +++ /dev/null @@ -1 +0,0 @@ -../xserver/gfx.h \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/icon.png b/project/jni/application/xserver-gimp/icon.png deleted file mode 100644 index cd7ce42f7..000000000 Binary files a/project/jni/application/xserver-gimp/icon.png and /dev/null differ diff --git a/project/jni/application/xserver-gimp/java.patch b/project/jni/application/xserver-gimp/java.patch deleted file mode 120000 index 45f7cbee5..000000000 --- a/project/jni/application/xserver-gimp/java.patch +++ /dev/null @@ -1 +0,0 @@ -../xserver/java.patch \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/main.c b/project/jni/application/xserver-gimp/main.c deleted file mode 120000 index 29336d6b4..000000000 --- a/project/jni/application/xserver-gimp/main.c +++ /dev/null @@ -1 +0,0 @@ -../xserver/main.c \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/project.patch b/project/jni/application/xserver-gimp/project.patch deleted file mode 120000 index 7b70e7761..000000000 --- a/project/jni/application/xserver-gimp/project.patch +++ /dev/null @@ -1 +0,0 @@ -../xserver/project.patch \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/pulseaudio b/project/jni/application/xserver-gimp/pulseaudio deleted file mode 120000 index 45f192f1d..000000000 --- a/project/jni/application/xserver-gimp/pulseaudio +++ /dev/null @@ -1 +0,0 @@ -../xserver/pulseaudio \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/readme.txt b/project/jni/application/xserver-gimp/readme.txt deleted file mode 100644 index 64677d2fa..000000000 --- a/project/jni/application/xserver-gimp/readme.txt +++ /dev/null @@ -1,18 +0,0 @@ -To build system image, download repo: - -https://github.com/pelya/debian-noroot - -install dependencies described in it's readme, -then launch commands: - -cd debian-noroot/img -./img-gimp-jessie-armhf.sh -./img-gimp-jessie-x86.sh -./img-gimp-jessie--prepare-obb.sh - -This will create Debian system image dist-gimp-jessie.tar.xz -Upload resulting system image somewhere, and change download URL inside -AndroidAppSettings.cfg, then recompile .apk file. - -Then follow instructions here: -https://github.com/pelya/commandergenius/tree/sdl_android/project/jni/application/xserver diff --git a/project/jni/application/xserver-gimp/xserver b/project/jni/application/xserver-gimp/xserver deleted file mode 120000 index 5be2b5474..000000000 --- a/project/jni/application/xserver-gimp/xserver +++ /dev/null @@ -1 +0,0 @@ -../xserver/xserver \ No newline at end of file diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg index 409bfc36b..7d7014c51 100644 --- a/project/jni/application/xserver/AndroidAppSettings.cfg +++ b/project/jni/application/xserver/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XServer XSDL" AppFullName=x.org.server # Application version code (integer) -AppVersionCode=12049 +AppVersionCode=12050 # Application user-visible version name (string) -AppVersionName="1.20.49" +AppVersionName="1.20.50" # 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, '!!' will also hide the entry from the menu, so it cannot be disabled diff --git a/project/jni/application/xserver/AndroidPreBuild.sh b/project/jni/application/xserver/AndroidPreBuild.sh deleted file mode 120000 index 9d3924cd3..000000000 --- a/project/jni/application/xserver/AndroidPreBuild.sh +++ /dev/null @@ -1 +0,0 @@ -../xserver-gimp/AndroidPreBuild.sh \ No newline at end of file diff --git a/project/jni/application/xserver/AndroidPreBuild.sh b/project/jni/application/xserver/AndroidPreBuild.sh new file mode 100755 index 000000000..433b46399 --- /dev/null +++ b/project/jni/application/xserver/AndroidPreBuild.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp -f xsdl.raw ../../../res/raw/ diff --git a/project/jni/application/xserver/java.patch b/project/jni/application/xserver/java.patch index 282bb65d5..00bc34a87 100644 --- a/project/jni/application/xserver/java.patch +++ b/project/jni/application/xserver/java.patch @@ -170,3 +170,12 @@ String lang = new String(Locale.getDefault().getLanguage()); if( Locale.getDefault().getCountry().length() > 0 ) lang = lang + "_" + Locale.getDefault().getCountry(); +@@ -742,7 +742,7 @@ public class Settings + Globals.TouchscreenKeyboardTheme = 9; + + if( Globals.TouchscreenKeyboardTheme == 0 ) +- nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.ultimatedroid)); ++ nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.xsdl)); + if( Globals.TouchscreenKeyboardTheme == 1 ) + nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.simpletheme)); + if( Globals.TouchscreenKeyboardTheme == 2 ) diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton1.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton1.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Auto.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton1Auto.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Auto.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton1Auto.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1AutoAnim.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton1AutoAnim.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1AutoAnim.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton1AutoAnim.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton1Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton1Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton2.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton2.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Auto.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton2Auto.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Auto.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton2Auto.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2AutoAnim.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton2AutoAnim.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2AutoAnim.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton2AutoAnim.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton2Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton2Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton3.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton3.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton3Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton3Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton4.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton4.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton4Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton4Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton5.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton5.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton5Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton5Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton6.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton6.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6Pressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton6Pressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6Pressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton6Pressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton7.png b/project/jni/application/xserver/screen-keys/UltimateDroidButton7.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidButton7.png rename to project/jni/application/xserver/screen-keys/UltimateDroidButton7.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidDPadButton.png b/project/jni/application/xserver/screen-keys/UltimateDroidDPadButton.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidDPadButton.png rename to project/jni/application/xserver/screen-keys/UltimateDroidDPadButton.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidDownButtonPressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidDownButtonPressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidDownButtonPressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidDownButtonPressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidLeftButtonPressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidLeftButtonPressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidLeftButtonPressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidLeftButtonPressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidRightButtonPressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidRightButtonPressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidRightButtonPressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidRightButtonPressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidUpButtonPressed.png b/project/jni/application/xserver/screen-keys/UltimateDroidUpButtonPressed.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidUpButtonPressed.png rename to project/jni/application/xserver/screen-keys/UltimateDroidUpButtonPressed.png diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidmouse_pointer.png b/project/jni/application/xserver/screen-keys/UltimateDroidmouse_pointer.png similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/UltimateDroidmouse_pointer.png rename to project/jni/application/xserver/screen-keys/UltimateDroidmouse_pointer.png diff --git a/project/jni/application/xserver-gimp/keyboard/key.xcf b/project/jni/application/xserver/screen-keys/key.xcf similarity index 100% rename from project/jni/application/xserver-gimp/keyboard/key.xcf rename to project/jni/application/xserver/screen-keys/key.xcf diff --git a/project/jni/application/xserver/ultimatedroid.raw b/project/jni/application/xserver/ultimatedroid.raw deleted file mode 120000 index d6de9e0d4..000000000 --- a/project/jni/application/xserver/ultimatedroid.raw +++ /dev/null @@ -1 +0,0 @@ -../xserver-gimp/ultimatedroid.raw \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/ultimatedroid.raw b/project/jni/application/xserver/xsdl.raw similarity index 100% rename from project/jni/application/xserver-gimp/ultimatedroid.raw rename to project/jni/application/xserver/xsdl.raw diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index a4e6f1199..56bee4b9c 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit a4e6f11993ef20201e8f58a94cc587ef4c09824e +Subproject commit 56bee4b9c78a21359fb56d31a98fbf3f5f77c57d