voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 13:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix sdl build in cicd

Browse source
This commit is contained in:
Stepanov Igor 2025-10-17 21:47:33 +03:00
parent 0c121f751b
commit 8481c5c2ba
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,15 @@ jobs:
sudo apt-get install -y build-essential libglew-dev libglew2.2 \ sudo apt-get install -y build-essential 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 cmake squashfs-tools valgrind
# dependency for building sdl
# https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md
sudo apt-get install -y build-essential git make \
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev \
libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-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/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

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

@ -40,6 +40,14 @@ jobs:
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev sudo apt-get install libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
# dependency for building sdl
# https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md
sudo apt-get install -y build-essential git make \
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-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

1
src/window/detail/SDLInput.cpp
View file

@ -277,7 +277,6 @@ void SDLInput::toggleCursor() {
cursorDrag = false; cursorDrag = false;
cursorLocked = !cursorLocked; cursorLocked = !cursorLocked;
SDL_SetWindowRelativeMouseMode(window.getSdlWindow(), cursorLocked); SDL_SetWindowRelativeMouseMode(window.getSdlWindow(), cursorLocked);
SDL_SetWindowMouseGrab(window.getSdlWindow(), cursorLocked);
} }
Bindings& SDLInput::getBindings() { Bindings& SDLInput::getBindings() {