From b1356ca5619f12298c094037a7646899b0beb694 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 13 Feb 2026 13:14:13 +0300 Subject: [PATCH] add freetype library --- .github/workflows/appimage.yml | 2 +- .github/workflows/cmake.yml | 2 +- .github/workflows/macos.yml | 2 +- Dockerfile | 1 + src/CMakeLists.txt | 2 ++ vcpkg.json | 3 ++- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 92c9d9fd6..f43254bd3 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -31,7 +31,7 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \ libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \ - libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind + libcurl4-openssl-dev libgtest-dev libfreetype6-dev cmake squashfs-tools valgrind # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 652cc26f9..f41e940e9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,7 +39,7 @@ jobs: # make && make install INSTALL_INC=/usr/include/lua run: | sudo apt-get update - sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev + sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev libfreetype6-dev # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9fdd8d0b3..c3f5156f9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies from brew run: | - brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm + brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm freetype - name: Configure run: | diff --git a/Dockerfile b/Dockerfile index e067b92d1..da90324fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ libluajit-5.1-dev \ libvorbis-dev \ libcurl4-openssl-dev \ + libfreetype6-dev \ ca-certificates \ wget \ && rm -rf /var/lib/apt/lists/* diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 226ac8c25..d6f4c5b74 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,6 +19,7 @@ find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) find_package(CURL REQUIRED) find_package(glfw3 REQUIRED) +find_package(Freetype REQUIRED) if(NOT APPLE) find_package(EnTT REQUIRED) endif() @@ -75,6 +76,7 @@ target_link_libraries( Vorbis::vorbis Vorbis::vorbisfile luajit::luajit + Freetype::Freetype PUBLIC glm::glm # Need public for src/delegates.hpp, which including to # main.cpp ) diff --git a/vcpkg.json b/vcpkg.json index 17145c4a0..4f56dc6c2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -13,6 +13,7 @@ "libvorbis", "entt", "gtest", - "curl" + "curl", + "freetype" ] }