Merge branch 'master' of ssh://code.nikooneshot.ru:222/Sunshine/mkxp-sunshine

PORTING.md

@@ -1,37 +1,36 @@
 <!-- markdownlint-disable MD033 -->
-# Портирование | Porting
-
 ## Операционные системы | Operating Systems
-
 | Платформа<br>Platform | Завершено<br>Done % | Состояние<br>State |
 | :--- | :---: | :--- |
 | Windows | 100% | Играбельно |
 | Linux | 91% | В работе, но уже играбельно<br>TODO:<br>&nbsp;\* Fix Wallpaper manager |
-| *BSD | 15% | в работе |
+| *BSD | 15% | не в работе |
-| GNU/Hurd | 1% | В работе |
+| GNU/Hurd | 1% | не в работе |
-| Solaris/OpenSolaris | 1% | В работе |
+| Solaris/OpenSolaris | 1% | не в работе |
 | RedoxOS | 0% | Не хватает библеотек |
 | Android | 4% | В работе |
-| PS Vita | 0% | В работе |
+| PS Vita | 0% | не в работе |
-| PSP | 1% | В работе |
+| PSP | 1% | не в работе |
 | Emspritein(web) | 11% | Нет хватает библеотек<br>&nbsp;\* Нужно написать порт библеотеки libsigc++2<br>(А лучше 3 и переписать движок)<br>&nbsp;\* Проблемы с компиляцией и зависимостями |
-| HaikuOS | 0% | В работе |
+| HaikuOS | 0% | не в работе |
 | DOS | 0.2% | Не в работе |
-| Ubuntu Touch | 61% | Будет почти готово тогда когда Linux порт будет доведён до ума |
+| Ubuntu Touch | 60% | Будет почти готово тогда когда Linux порт будет доведён до ума |
-| Аврора ОС | 0% | Возможно, но пока не в работе |
+| Аврора ОС | 0% | не в работе |
 | ChromeOS/ChromiumOS | 0.4% | Неизвестное |
 | MacOS | 10.5% | Неизвестное, но работа ведётся |
+| Kyronix | 10% | В работе сторонней командой разработчиков|
 
 ## Окружения рабочего стола | Desktop Environments
-
 | Окружение<br>Environments | Завершено<br>Done % |
 | :--- | :---: |
+| X11 standalone window managers | 0% |
+| Wayland standalone window managers | 0% |
 | LXDE | 100% |
 | XFCE | 10% |
 | GNOME | 10% |
 | KDE | 10% |
-| LXQt | 0% |
+| LXQT | 0% |
-| MATE | 0% |
+| MATE | 10% |
 | Cinnamon | 10% |
 | Budgie | 0% |
 | Deepin | 10% |
@@ -42,28 +41,7 @@
 | Sugar Desktop | 0% |
 | ROX Desktop | 0% |
 | Fluxbox | 0% |
-| Openbox | 0% |
 | Trinity | 0% |
-| Blackbox | 0% |
-| AwesomeWM | 0% |
-| DWM | 0% |
-| hyperland | 0% |
-| niri | 0% |
 | Fish | 0% |
 | Lumina | 0% |
 | IceWM | 0% |
-| Window Maker | 0% |
-| I3 | 0% |
-| Sway | 0% |
-| Wayfire | 0% |
-| bspwm | 0% |
-| herbstluftwm | 0% |
-| xmonad | 0% |
-| qtile | 0% |
-| CDE | 0% |
-| Fvwm95 | 0% |
-| OpenWindows | 0% |
-| Dt | 0% |
-| 9wm | 0% |
-| Twm | 0% |
-| WindowLab | 0% |

changelogs/0.1.1.txt

@@ -69,4 +69,5 @@ Rewrited to use SDL3 libc methods instead default
 Removed useless debug logs
 Glen reworked
 GLLogger \n bug fix
-Removed text size limit in Ed Message
+Removed text size limit in Ed Message
+Rewrited Linux build scripts

make-oneshot-linux.sh

@@ -1,28 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 set -euo pipefail
-cd `dirname $0`
+cd "dirname $0"
 
 # User-configurable variables.
 oneshot_id=420530
 STEAMWORKS_PATH=$(realpath ..)/steamworks
 
-# Colors.
-white="\033[0;37m"      # White - Regular
-bold="\033[1;37m"       # White - Bold
-cyan="\033[1;36m"       # Cyan - Bold
-green="\033[1;32m"      # Green - Bold
-color_reset="\033[0m"   # Reset Colors
-
-echo -e "Compiling ${bold}Sunshine Bandle for Linux...${color_reset}\n"
-
 cmake . -B build/
 cd build
-make
+make -j$(nproc)
 cd ..
 
 mkdir build/bandle
-mkdir build/bandle/Sunshine
+mkdir build/bandle
-mkdir build/bandle/Sunshine/Data
+mkdir build/bandle/Data
 
 # Compile steamshim.
 #echo -e "-> ${cyan}Compile steamshim...${color_reset}"
@@ -33,41 +24,30 @@ mkdir build/bandle/Sunshine/Data
 #cp "$STEAMWORKS_PATH/redistributable_bin/linux64/libsteam_api.so" .
 #make -j${make_threads} > steamshim.make.out
 #cd ../..
-
-# Compile Journal.
-echo -e "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec #--windowed
+ruby rpgscript.rb scripts/ build/bandle/
 
-# Compile scripts.
+cp -r dist/_______/* build/bandle/
-echo -e "-> ${cyan}Compile xScripts.rxdata...${color_reset}"
+cp build/oneshot build/bandle/
-ruby rpgscript.rb scripts/ build/bandle/Sunshine/
-
-# Copy results.
-echo -e "-> ${cyan}Install OneShot apps to Steam directory...${color_reset}"
-yes | cp -r dist/_______/* build/bandle/Sunshine/
-yes | cp build/oneshot build/bandle/Sunshine
 
 #yes | cp steamshim_parent/build/steamshim "$ONESHOT_PATH"
 #echo "$oneshot_id" > "$ONESHOT_PATH/steam_appid.txt"
 
 # Copy libraries.
-echo -e "-> ${cyan}Install OneShot libraries to Steam directory...${color_reset}"
 mkdir libs
 ldd build/oneshot | ruby libraries.rb
 #ldd steamshim_parent/build/steamshim | ruby libraries.rb
-yes | cp libs/* build/bandle/Sunshine
+cp libs/* build/bandle
-yes | cp build/oneshot build/bandle/Sunshine
+cp build/oneshot build/bandle
 
-cp installer/installer.sh build/bandle/
+cp -r ../SunshineAssets/* build/bandle
-cp -r ../SunshineAssets/* build/bandle/Sunshine
+cp oneshot.conf build/bandle
-cp oneshot.conf build/bandle/Sunshine
 
 cd build
 zip -r OneshotSunshine.zip bandle/*
 cd ..
 
 # Cleanup.
-echo -e "-> ${cyan}Cleanup files...${color_reset}"
 rm -rf journal/unix/__pycache__
 #rm -rf build/*
 rm -rf dist