voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-14 07:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

add freetype library

Browse source
This commit is contained in:
MihailRis 2026-02-13 13:14:13 +03:00
parent a5ef4710bc
commit b1356ca561
6 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/appimage.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \ 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 \ 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 # 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/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 sudo ln -s /usr/include/luajit-2.1 /usr/include/lua

2
.github/workflows/cmake.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
# make && make install INSTALL_INC=/usr/include/lua # make && make install INSTALL_INC=/usr/include/lua
run: | run: |
sudo apt-get update 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 # 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/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 sudo ln -s /usr/include/luajit-2.1 /usr/include/lua

2
.github/workflows/macos.yml vendored
View file

@ -23,7 +23,7 @@ jobs:
- name: Install dependencies from brew - name: Install dependencies from brew
run: | 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 - name: Configure
run: | run: |

1
Dockerfile
View file

@ -25,6 +25,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libluajit-5.1-dev \ libluajit-5.1-dev \
libvorbis-dev \ libvorbis-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libfreetype6-dev \
ca-certificates \ ca-certificates \
wget \ wget \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

2
src/CMakeLists.txt
View file

@ -19,6 +19,7 @@ find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(Freetype REQUIRED)
if(NOT APPLE) if(NOT APPLE)
find_package(EnTT REQUIRED) find_package(EnTT REQUIRED)
endif() endif()
@ -75,6 +76,7 @@ target_link_libraries(
Vorbis::vorbis Vorbis::vorbis
Vorbis::vorbisfile Vorbis::vorbisfile
luajit::luajit luajit::luajit
Freetype::Freetype
PUBLIC glm::glm # Need public for src/delegates.hpp, which including to PUBLIC glm::glm # Need public for src/delegates.hpp, which including to
# main.cpp # main.cpp
) )

3
vcpkg.json
View file

@ -13,6 +13,7 @@
"libvorbis", "libvorbis",
"entt", "entt",
"gtest", "gtest",
"curl" "curl",
"freetype"
] ]
} }