From aa9cf217965837c591050bbedcda0d8450f97d51 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 4 Oct 2021 16:47:02 +0200 Subject: [PATCH] Delete most remaning references to SDL_ttf --- Brewfile | 2 +- .../devilutionx/DevilutionXSDLActivity.java | 1 - docs/installing.md | 10 ++++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Brewfile b/Brewfile index 4bcc74f3a..fdf966b47 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,5 @@ brew "cmake" brew "fmt" -brew "sdl2_ttf" +brew "sdl2" brew "libsodium" brew "pkg-config" diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java index 5ce6715bf..412c05a85 100644 --- a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java +++ b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java @@ -191,7 +191,6 @@ public class DevilutionXSDLActivity extends SDLActivity { protected String[] getLibraries() { return new String[]{ "SDL2", - "SDL2_ttf", "devilutionx" }; } diff --git a/docs/installing.md b/docs/installing.md index b1a477f9b..038bbdf5a 100644 --- a/docs/installing.md +++ b/docs/installing.md @@ -17,9 +17,9 @@ Download the latest [DevilutionX release](https://github.com/diasurgical/devilut
Linux - Copy the MPQ files to the folder containing the DevilutionX executable, or to the data folder. The data folder path may differ depending on distro, version, and security settings, but will normally be `~/.local/share/diasurgical/devilution/` -- Install [SDL2](https://www.libsdl.org/download-2.0.php) and [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/): - - Ubuntu/Debian/Rasbian `sudo apt install libsdl2-2.0-0 libsdl2-ttf-2.0-0` - - Fedora `sudo dnf install SDL2 SDL2_ttf` +- Install [SDL2](https://www.libsdl.org/download-2.0.php): + - Ubuntu/Debian/Rasbian `sudo apt install libsdl2-2.0-0` + - Fedora `sudo dnf install SDL2` - Run `./devilutionx`
@@ -53,7 +53,7 @@ sudo apt install devilutionx
Nintendo Switch -- Copy `devilutionx.nro` and `CharisSILB.ttf` in into `/switch/devilutionx` +- Copy `devilutionx.nro` in into `/switch/devilutionx` - Copy the MPQ files to `/switch/devilutionx`. - Launch `devilutionx.nro` by holding R the installed game. Do not use the album to launch, if you use the album, the homebrew will only have a small amount of memory available, and the touch keyboard won't work. This is true for all homebrew, not just DevilutionX. @@ -72,7 +72,6 @@ sudo apt install devilutionx - Copy `devilutionx.3dsx` into `sd:/3ds/devilutionx/`. - Copy the MPQ files into `sd:/3ds/devilutionx/`. -- Copy the `CharisSILB.ttf` font file into `sd:/3ds/devilutionx/`. - Launch `devilutionx.3dsx` with the [Homebrew Launcher](https://github.com/fincs/new-hbmenu). - *Note:* When the Hellfire .mpqs are installed you can still launch regular Diablo by passing `--diablo` to `devilutionx.3dsx`. @@ -80,7 +79,6 @@ sudo apt install devilutionx - Copy `devilutionx.cia` to your SD card. - Copy the MPQ files to `sd:/3ds/devilutionx/`. -- Copy the `CharisSILB.ttf` font file into `sd:/3ds/devilutionx/`. - Install `devilutionx.cia` with a title manager (e.g. [FBI](https://github.com/Steveice10/FBI)). - `devilutionx.cia` can be removed after being installed. - Launch Diablo from your 3DS Homemenu.