From 11dae845a9ccd1fc3077fd67b6835a0c8b6d3695 Mon Sep 17 00:00:00 2001 From: frrsth Date: Sat, 6 Nov 2021 08:18:32 -0700 Subject: [PATCH] remove ttf references --- .circleci/config.yml | 4 ++-- .github/workflows/Linux_x86.yml | 2 +- .github/workflows/Linux_x86_64_SDL1.yml | 2 +- docs/manual/platforms/n3ds.md | 8 +++----- docs/manual/platforms/switch.md | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01d9b1c78..e3b757b01 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: apt update -y - - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget smpq + - run: apt install -y g++ libsdl2-dev git rpm wget smpq - run: apt install -y -t 'stretch-backports*' cmake libsodium-dev libpng-dev - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr - run: cmake --build build -j 2 --target package @@ -24,7 +24,7 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y cmake curl g++ git lcov libgtest-dev libgmock-dev libfmt-dev libsdl2-dev libsdl2-ttf-dev libsodium-dev libpng-dev + - run: apt-get install -y cmake curl g++ git lcov libgtest-dev libgmock-dev libfmt-dev libsdl2-dev libsodium-dev libpng-dev - run: cmake -S. -Bbuild -DRUN_TESTS=ON -DENABLE_CODECOVERAGE=ON - run: cmake --build build -j 2 - run: cmake --build build -j 2 --target test diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml index 07b920fac..79e96dbac 100644 --- a/.github/workflows/Linux_x86.yml +++ b/.github/workflows/Linux_x86.yml @@ -20,7 +20,7 @@ jobs: run: > sudo dpkg --add-architecture i386 && sudo apt update -y && - sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget smpq + sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget smpq - name: Cache CMake build folder uses: actions/cache@v2 diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml index 6b389aa11..a77b31962 100644 --- a/.github/workflows/Linux_x86_64_SDL1.yml +++ b/.github/workflows/Linux_x86_64_SDL1.yml @@ -19,7 +19,7 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsdl-ttf2.0-dev libsodium-dev libpng-dev rpm smpq + sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsodium-dev libpng-dev rpm smpq - name: Cache CMake build folder uses: actions/cache@v2 diff --git a/docs/manual/platforms/n3ds.md b/docs/manual/platforms/n3ds.md index 38f3834fc..4ab63a539 100644 --- a/docs/manual/platforms/n3ds.md +++ b/docs/manual/platforms/n3ds.md @@ -8,12 +8,11 @@ Start by downloading [devilutionx-n3ds.zip](https://github.com/diasurgical/devil
.3dsx installation #### Install DevilutionX: Diablo -1. Extract `devilutionx.3dsx`, `CharisSILB.ttf`, and `devilutionx.mpq` and put them into `sd:/3ds/devilutionx/`. +1. Extract `devilutionx.3dsx` and place into `sd:/3ds/devilutionx/`. 2. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. #### Install DevilutionX: Diablo - Hellfire 3. Copy `hellfire.mpq` `hfmonk.mpq` `hfmusic.mpq` and `hfvoice.mpq` from your Hellfire CD (or GoG install folder) to `sd:/3ds/devilutionx/`. - 1. *Note:* When the Hellfire .mpqs are installed you can still launch regular Diablo by passing `--diablo` to `devilutionx.3dsx`.
@@ -21,9 +20,8 @@ Start by downloading [devilutionx-n3ds.zip](https://github.com/diasurgical/devil #### Install DevilutionX: Diablo 1. Extract `devilutionx.cia` and place it on your SD card. -2. Extract `devilutionx.mpq` and `CharisSILB.ttf` and put them into `sd:/3ds/devilutionx/`. -3. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. -4. Put the SD card back into the 3DS and install `devilutionx.cia` using a title manager (e.g. [FBI](https://github.com/Steveice10/FBI)). +2. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. +3. Put the SD card back into the 3DS and install `devilutionx.cia` using a title manager (e.g. [FBI](https://github.com/Steveice10/FBI)). 1. `devilutionx.cia` can be removed after being installed. ##### Install DevilutionX: Diablo - Hellfire diff --git a/docs/manual/platforms/switch.md b/docs/manual/platforms/switch.md index beb283671..9ef200b0c 100644 --- a/docs/manual/platforms/switch.md +++ b/docs/manual/platforms/switch.md @@ -3,7 +3,7 @@ ## Installation 1. Download and unzip [devilutionx-switch.zip](https://github.com/diasurgical/devilutionX/releases/latest/download/devilutionx-switch.zip). -2. Put `devilutionx.nro` and `CharisSILB.ttf` in into `/switch/devilutionx` +2. Put `devilutionx.nro` into `/switch/devilutionx` 3. Copy `diabdat.mpq` from your CD (or GoG install folder) to `/switch/devilutionx`. ## Usage