Skip to content

Commit 76dbd0d

Browse files
sfan5sfan5
authoredJan 8, 2022
Fully remove bitmap font support (#11863)
Freetype is now a build requirement.
·
5.11.05.5.0
1 parent bf22569 commit 76dbd0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+71
-319
lines changed
 

Diff for: ‎.github/workflows/build.yml

-23
Original file line numberDiff line numberDiff line change
@@ -150,29 +150,6 @@ jobs:
150150
run: |
151151
./bin/minetestserver --run-unittests
152152
153-
# Build without freetype (client-only)
154-
clang_9_no_freetype:
155-
name: "clang_9 (FREETYPE=0)"
156-
runs-on: ubuntu-18.04
157-
steps:
158-
- uses: actions/checkout@v2
159-
- name: Install deps
160-
run: |
161-
source ./util/ci/common.sh
162-
install_linux_deps clang-9
163-
164-
- name: Build
165-
run: |
166-
./util/ci/build.sh
167-
env:
168-
CC: clang-9
169-
CXX: clang++-9
170-
CMAKE_FLAGS: "-DENABLE_FREETYPE=0 -DBUILD_SERVER=0"
171-
172-
- name: Test
173-
run: |
174-
./bin/minetest --run-unittests
175-
176153
docker:
177154
name: "Docker image"
178155
runs-on: ubuntu-18.04

Diff for: ‎README.md

+8-10
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,16 @@ Compiling
135135
| GCC | 4.9+ | Can be replaced with Clang 3.4+ |
136136
| CMake | 3.5+ | |
137137
| IrrlichtMt | - | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
138-
| SQLite3 | 3.0+ | |
138+
| Freetype | 2.0+ | |
139+
| SQLite3 | 3+ | |
139140
| Zstd | 1.0+ | |
140141
| LuaJIT | 2.0+ | Bundled Lua 5.1 is used if not present |
141142
| GMP | 5.0.0+ | Bundled mini-GMP is used if not present |
142143
| JsonCPP | 1.0.0+ | Bundled JsonCPP is used if not present |
143144

144145
For Debian/Ubuntu users:
145146

146-
sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
147+
sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev
147148

148149
For Fedora users:
149150

@@ -247,7 +248,6 @@ General options and their default values:
247248
MinSizeRel - Release build with -Os passed to compiler to make executable as small as possible
248249
ENABLE_CURL=ON - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
249250
ENABLE_CURSES=ON - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
250-
ENABLE_FREETYPE=ON - Build with FreeType2; Allows using TTF fonts
251251
ENABLE_GETTEXT=ON - Build with Gettext; Allows using translations
252252
ENABLE_GLES=OFF - Build for OpenGL ES instead of OpenGL (requires support by IrrlichtMt)
253253
ENABLE_LEVELDB=ON - Build with LevelDB; Enables use of LevelDB map backend
@@ -273,10 +273,10 @@ Library specific options:
273273
EGL_INCLUDE_DIR - Only if building with GLES; directory that contains egl.h
274274
EGL_LIBRARY - Only if building with GLES; path to libEGL.a/libEGL.so
275275
EXTRA_DLL - Only on Windows; optional paths to additional DLLs that should be packaged
276-
FREETYPE_INCLUDE_DIR_freetype2 - Only if building with FreeType 2; directory that contains an freetype directory with files such as ftimage.h in it
277-
FREETYPE_INCLUDE_DIR_ft2build - Only if building with FreeType 2; directory that contains ft2build.h
278-
FREETYPE_LIBRARY - Only if building with FreeType 2; path to libfreetype.a/libfreetype.so/freetype.lib
279-
FREETYPE_DLL - Only if building with FreeType 2 on Windows; path to libfreetype.dll
276+
FREETYPE_INCLUDE_DIR_freetype2 - Directory that contains files such as ftimage.h
277+
FREETYPE_INCLUDE_DIR_ft2build - Directory that contains ft2build.h
278+
FREETYPE_LIBRARY - Path to libfreetype.a/libfreetype.so/freetype.lib
279+
FREETYPE_DLL - Only on Windows; path to libfreetype-6.dll
280280
GETTEXT_DLL - Only when building with gettext on Windows; paths to libintl + libiconv DLLs
281281
GETTEXT_INCLUDE_DIR - Only when building with gettext; directory that contains iconv.h
282282
GETTEXT_LIBRARY - Only when building with gettext on Windows; path to libintl.dll.a
@@ -337,7 +337,6 @@ vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo
337337
- **Don't forget about IrrlichtMt.** The easiest way is to clone it to `lib/irrlichtmt` as described in the Linux section.
338338
- `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
339339
- `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
340-
- `freetype` is optional, it allows true-type font rendering.
341340
- `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter.
342341
- `gmp` and `jsoncpp` are optional, otherwise the bundled versions will be compiled
343342

@@ -429,8 +428,7 @@ cmake .. \
429428
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
430429
-DCMAKE_FIND_FRAMEWORK=LAST \
431430
-DCMAKE_INSTALL_PREFIX=../build/macos/ \
432-
-DRUN_IN_PLACE=FALSE \
433-
-DENABLE_FREETYPE=TRUE -DENABLE_GETTEXT=TRUE
431+
-DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE
434432

435433
make -j$(nproc)
436434
make install

0 commit comments

Comments
 (0)
Please sign in to comment.