Browse Source

OpenDingux: Remove RS90 stuff

That device only has a 2-inch screen and doesn't have X/Y so I don't
think there is a point in porting to it.
pull/486/head
Gleb Mazovetskiy 6 years ago
parent
commit
7bb1e3de12
  1. 4
      Packaging/OpenDingux/build-rs90.sh
  2. 12
      Packaging/OpenDingux/build.sh
  3. 31
      README.md

4
Packaging/OpenDingux/build-rs90.sh

@ -1,4 +0,0 @@
#!/usr/bin/env bash
declare -r DIR="$(dirname "${BASH_SOURCE[0]}")"
"${DIR}/build.sh" rs90

12
Packaging/OpenDingux/build.sh

@ -4,7 +4,7 @@ set -euo pipefail
usage() {
echo "Usage: build.sh [target]"
echo " target: target architecture. Either rs90, rg350 or retrofw"
echo " target: target architecture. Either rg350 or retrofw"
}
if [[ $# -ne 1 ]]; then
@ -13,7 +13,7 @@ if [[ $# -ne 1 ]]; then
exit 1
fi
if [[ "$1" != "rs90" ]] && [[ "$1" != "rg350" ]] && [[ "$1" != "retrofw" ]]; then
if [[ "$1" != "rg350" ]] && [[ "$1" != "retrofw" ]]; then
echo "Error: invalid target"
usage
exit 1
@ -47,9 +47,7 @@ prepare_buildroot() {
fi
if [[ "$TARGET" == "rg350" ]]; then
git clone --depth=1 https://github.com/tonyjih/RG350_buildroot.git "$BUILDROOT"
elif [[ "$TARGET" == "rs90" ]]; then
git clone --depth=1 -b od-rs90 https://github.com/OpenDingux/buildroot.git "$BUILDROOT"
else
else # retrofw
if [[ ! -f $BUILDROOT_ARCHIVE ]]; then
\curl https://buildroot.org/downloads/${BUILDROOT_VER}.tar.gz -o "$BUILDROOT_ARCHIVE"
fi
@ -112,9 +110,7 @@ build() {
-DJOY_BUTTON_START=9
-DJOY_BUTTON_BACK=8
)
elif [[ "$TARGET" == "rs90" ]]; then
defs+=(-DUSE_SDL1=ON)
else
else # retrofw
defs+=(
-DUSE_SDL1=ON
-DRETROFW=ON

31
README.md

@ -99,16 +99,21 @@ Make sure to install the `C++ CMake tools for Windows` component for Visual Stud
* **Using vcpkg (recommended)**
1. Install vcpkg following the instructions from https://github.com/microsoft/vcpkg#quick-start.
Don't forget to perform _user-wide integration_ step for additional convenience.
Don't forget to perform _user-wide integration_ step for additional convenience.
2. Install required dependencies by executing the following command (via cmd or powershell):
For the 64-bit version of the dependencies please run this command:
`vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows`
For the 32-bit version of the dependencies please run this command:
`vcpkg install sdl2:x86-windows sdl2-mixer:x86-windows sdl2-ttf:x86-windows libsodium:x86-windows`
For the 64-bit version of the dependencies please run this command:
```
vcpkg install sdl2:x64-windows sdl2-mixer:x64-windows sdl2-ttf:x64-windows libsodium:x64-windows
```
For the 32-bit version of the dependencies please run this command:
```
vcpkg install sdl2:x86-windows sdl2-mixer:x86-windows sdl2-ttf:x86-windows libsodium:x86-windows
```
* **Manually**
1. Download and place the MSVC Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `%USERPROFILE%\AppData\Local\Microsoft\WindowsApps\`.
2. If dependencies are not found or you wish to place them in other location - configure required path variables in _"Manage Configurations..."_ dialog inside Visual Studio or in _cmake-gui_.
@ -186,16 +191,6 @@ This OpenDingux build uses the buildroot at `$HOME/buildroot-rg350-devilutionx`.
Packaging/OpenDingux/build-rg350.sh
~~~
### Old OpenDingux (RS90)
This OpenDingux build uses the buildroot at `$HOME/buildroot-rs90-devilutionx`.
~~~ bash
Packaging/OpenDingux/build-rs90.sh
~~~
</details>
## CMake arguments

Loading…
Cancel
Save