GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into project_setup_refactor

Browse Source 
# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Georg Hagen
2024-08-14 22:47:19 +02:00
parent 729d1f3e55 3ecfd98b14
commit 840ff67f01
61 changed files with 2489 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/DependencyMirrors.txt
View File

@@ -21,4 +21,5 @@ UTFCPP_REPO=https://git.madvoxel.net/Mirrors/utfcpp.git
TRACY_REPO=https://git.madvoxel.net/Mirrors/tracy.git
STB_REPO=https://git.madvoxel.net/Mirrors/stb.git
UNITS_REPO=https://git.madvoxel.net/Mirrors/units.git
ANKERLUD_REPO=https://git.madvoxel.net/Mirrors/ankerl_unordered_dense.git
ANKERLUD_REPO=https://git.madvoxel.net/Mirrors/ankerl_unordered_dense.git
MSDFGEN_REPO=https://git.madvoxel.net/Mirrors/msdfgen.git

2
.gitea/workflows/build_pc.yml
View File

@@ -32,7 +32,7 @@ jobs:
- name: Install Dev Packages
if: matrix.os == 'ubuntu-latest'
run: >
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip
&& sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt"