File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2121 uses : actions/download-artifact@v6
2222 with :
2323 name : Build-linux-${{ inputs.configuration }}
24+ path : Result.Linux.${{inputs.architecture}}.${{ inputs.configuration }}
2425
2526 - name : Install Dependencies
26- run : sudo apt-get install 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 apt-transport-https software-properties-common gcc g++ powershell clang-format-22 glslang-tools libwayland-dev libxkbcommon-dev
27+ run : sudo apt-get install 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 apt-transport-https software-properties-common gcc g++ powershell glslang-tools libwayland-dev libxkbcommon-dev
2728
2829 - name : Update access permission of ZEngineTests
2930 run : chmod +x ${{github.workspace}}/tests/ZEngineTests
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ foreach(FragmentShader ${FragmentShaders})
3131 cmake_path (APPEND ShaderOutputPath ${FragmentShaderOutputFileName} OUTPUT_VARIABLE FragmentShaderOutputPath )
3232
3333
34- add_custom_target ("Compile-${shaderfilename} -fragment" ALL COMMAND glslang-standalone "-I${ShaderPath} " "-V" ${Flags} "-o" "${FragmentShaderOutputPath} " "${FragmentShader} " )
34+ add_custom_target ("Compile-${shaderfilename} -fragment" ALL COMMAND glslang::glslang -standalone "-I${ShaderPath} " "-V" ${Flags} "-o" "${FragmentShaderOutputPath} " "${FragmentShader} " )
3535
3636endforeach ()
3737
@@ -42,4 +42,4 @@ install(DIRECTORY Shaders/Cache DESTINATION bin/Shaders)
4242if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
4343 install (DIRECTORY Editor/Settings DESTINATION Obelisk/${CMAKE_BUILD_TYPE} )
4444 install (DIRECTORY Shaders/Cache DESTINATION Obelisk/${CMAKE_BUILD_TYPE} /Shaders)
45- endif ()
45+ endif ()
Original file line number Diff line number Diff line change @@ -201,8 +201,6 @@ FetchContent_MakeAvailable(
201201 GTest
202202 )
203203
204- find_package (SPIRV-Tools-opt CONFIG )
205-
206204set (IMGUIDIR ${FETCHCONTENT_BASE_DIR} /imgui)
207205
208206add_library (imgui STATIC )
@@ -264,15 +262,12 @@ target_link_libraries(External_libs
264262 glfw
265263 fmt::fmt
266264 imguizmo
267- spdlog::spdlog
265+ spdlog::spdlog_header_only
268266 EnTT::EnTT
269267 assimp::assimp
270268 stduuid
271269 yaml-cpp::yaml-cpp
272270 spirv-cross-core
273- SPIRV-Tools-opt
274- glslang::glslang
275- glslang::glslang-default-resource-limits
276271 glslang::SPIRV
277272 GPUOpen::VulkanMemoryAllocator
278273 nlohmann_json::nlohmann_json
You can’t perform that action at this time.
0 commit comments