mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-11 14:01:49 +00:00
ci/cd update
This commit is contained in:
parent
5e19c6807c
commit
bca742186f
8 changed files with 13 additions and 23 deletions
2
.github/workflows/appimage.yml
vendored
2
.github/workflows/appimage.yml
vendored
|
|
@ -23,7 +23,7 @@ jobs:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
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 libsdl3-dev 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
|
||||||
# fix luajit paths
|
# fix luajit paths
|
||||||
|
|
|
||||||
2
.github/workflows/cmake.yml
vendored
2
.github/workflows/cmake.yml
vendored
|
|
@ -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 libsdl3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-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
2
.github/workflows/macos.yml
vendored
|
|
@ -17,7 +17,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 sdl3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1
|
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||||
xauth \
|
xauth \
|
||||||
gdb \
|
gdb \
|
||||||
gdbserver \
|
gdbserver \
|
||||||
libglfw3-dev \
|
libsdl3-dev \
|
||||||
libglfw3 \
|
|
||||||
libglew-dev \
|
libglew-dev \
|
||||||
libglew2.2 \
|
libglew2.2 \
|
||||||
libglm-dev \
|
libglm-dev \
|
||||||
|
|
|
||||||
19
README.md
19
README.md
|
|
@ -28,13 +28,13 @@ sudo make install
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
su -
|
su -
|
||||||
apt-get install entt-devel libglfw3-devel libGLEW-devel libglm-devel libpng-devel libvorbis-devel libopenal-devel libluajit-devel libstdc++13-devel-static libcurl-devel
|
apt-get install entt-devel SDL3-devel libGLEW-devel libglm-devel libpng-devel libvorbis-devel libopenal-devel libluajit-devel libstdc++13-devel-static libcurl-devel
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Debian based distros
|
#### Debian based distros
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo apt install libglfw3 libglfw3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libcurl4-openssl-dev
|
sudo apt install libsdl3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libcurl4-openssl-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!TIP]
|
> [!TIP]
|
||||||
|
|
@ -48,21 +48,12 @@ sudo apt install libglfw3 libglfw3-dev libglew-dev libglm-dev libpng-dev libopen
|
||||||
#### RHEL based distros
|
#### RHEL based distros
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo dnf install glfw-devel glew-devel glm-devel libpng-devel libvorbis-devel openal-soft-devel luajit-devel libcurl-devel
|
sudo dnf install SDL3-devel glew-devel glm-devel libpng-devel libvorbis-devel openal-soft-devel luajit-devel libcurl-devel
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Arch based distros
|
#### Arch based distros
|
||||||
|
|
||||||
If you use X11:
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo pacman -S glfw-x11 glew glm libpng libvorbis openal luajit libcurl
|
sudo pacman -S sdl3 glew glm libpng libvorbis openal luajit libcurl
|
||||||
```
|
|
||||||
|
|
||||||
If you use Wayland:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit libcurl
|
|
||||||
```
|
```
|
||||||
|
|
||||||
And install EnTT:
|
And install EnTT:
|
||||||
|
|
@ -92,7 +83,7 @@ cmake --build . --parallel
|
||||||
### Install libraries
|
### Install libraries
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
brew install glfw3 glew glm libpng libvorbis lua luajit libcurl openal-soft skypjack/entt/entt
|
brew install sdl3 glew glm libpng libvorbis lua luajit libcurl openal-soft skypjack/entt/entt
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!TIP]
|
> [!TIP]
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ AppDir:
|
||||||
- libexpat1
|
- libexpat1
|
||||||
- libfam0
|
- libfam0
|
||||||
- libgcrypt20
|
- libgcrypt20
|
||||||
- libglfw3
|
- libsdl3
|
||||||
- libglew2.2
|
- libglew2.2
|
||||||
- libpng16-16
|
- libpng16-16
|
||||||
- libopenal1
|
- libopenal1
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
glm
|
glm
|
||||||
glfw
|
sdl3
|
||||||
glew
|
glew
|
||||||
zlib
|
zlib
|
||||||
libpng
|
libpng
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
]; # libglvnd
|
]; # libglvnd
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
glfw
|
sdl3
|
||||||
mesa
|
mesa
|
||||||
freeglut
|
freeglut
|
||||||
entt
|
entt
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"opengl",
|
"opengl",
|
||||||
"openal-soft",
|
"openal-soft",
|
||||||
"glfw3",
|
"sdl3",
|
||||||
"glew",
|
"glew",
|
||||||
"glm",
|
"glm",
|
||||||
"libpng",
|
"libpng",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue