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

# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Georg Hagen
2024-08-14 22:47:19 +02:00
61 changed files with 2489 additions and 96 deletions

View File

@@ -59,6 +59,7 @@ target_link_libraries(openVulkanoCpp PUBLIC magic_enum yaml-cpp fmt spdlog glm p
LinkAssimp(openVulkanoCpp)
LinkLibArchive(openVulkanoCpp)
LinkLibJpegTurbo(openVulkanoCpp)
LinkMsdf(openVulkanoCpp)
SetGlmDefines(openVulkanoCpp)
add_compile_definitions(LIBARCHIVE_STATIC)