Skip to content

Commit d525a3b

Browse files
Build All from scratch
1 parent b38b332 commit d525a3b

5 files changed

Lines changed: 14 additions & 13 deletions

File tree

.github/workflows/job-cmakebuild-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
1818

19-
- name: Install External Dependencies
20-
run: sudo apt-get update && sudo apt-get install -f -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev
19+
# - name: Install External Dependencies
20+
# run: sudo apt-get update && sudo apt-get install -f -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev
2121

2222
- name: CMake Build
2323
run: cmake --preset Linux_${{ inputs.configuration }} && cmake --build --preset Linux_${{ inputs.configuration }}

.github/workflows/job-cmakebuild-macOS.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26-
- name: Install Dependencies
27-
run: brew install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
26+
# - name: Install Dependencies
27+
# run: brew install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
2828

2929
- name: CMake Build
3030
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0

.github/workflows/job-cmakebuild-windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
run: git clone --depth=1 https://github.com/Microsoft/vcpkg; bootstrap-vcpkg.bat
2525
shell: pwsh
2626

27-
- name: Install Vulkan
28-
env:
29-
VCPKG_BUILD_TYPE: ${{ inputs.configuration }}
30-
CMAKE_TOOLCHAIN_FILE: "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
31-
run: vcpkg install vulkan-headers vulkan-loader
32-
shell: pwsh
27+
# - name: Install Vulkan
28+
# env:
29+
# VCPKG_BUILD_TYPE: ${{ inputs.configuration }}
30+
# CMAKE_TOOLCHAIN_FILE: "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
31+
# run: vcpkg install vulkan-headers vulkan-loader
32+
# shell: pwsh
3333

3434
- name: CMake Build
3535
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0

CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113
"name": "MacOS_Debug",
114114
"inherits": "Windows_Debug",
115115
"displayName": "MacOS XCode Debug",
116-
"generator": "Xcode"
116+
"generator": "Ninja"
117117
},
118118
{
119119
"name": "MacOS_Release",
120120
"inherits": "Windows_Release",
121121
"displayName": "MacOS XCode Release",
122-
"generator": "Xcode"
122+
"generator": "Ninja"
123123
},
124124

125125
{

dependencies.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,13 @@ Fetchcontent_Declare(
168168
FetchContent_Declare(Vulkan-Loader
169169
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
170170
GIT_SHALLOW TRUE
171-
GIT_TAG main
171+
GIT_TAG v1.3.302
172172
)
173173

174174
FetchContent_Declare(Vulkan-Headers
175175
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
176176
GIT_SHALLOW TRUE
177+
GIT_TAG v1.3.302
177178
)
178179

179180
FetchContent_MakeAvailable(

0 commit comments

Comments
 (0)