Merge branch 'main' into slang

HoneybunchBuilder · Aug 31, 2024 · 0deecc0 · 0deecc0
2 parents 39363d2 + 4a8caf0
commit 0deecc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,6 +135,8 @@ find_package(mysofa CONFIG REQUIRED)
 find_package(pffft CONFIG REQUIRED)
 find_package(flatbuffers CONFIG REQUIRED)
 find_package(steam-audio CONFIG REQUIRED)
+find_package(VulkanHeaders CONFIG REQUIRED)
+find_package(VulkanMemoryAllocator CONFIG REQUIRED)
 
 find_path(CGLTF_INCLUDE_DIRS "cgltf.h")
 
@@ -169,6 +171,8 @@ list(APPEND library_list "meshoptimizer::meshoptimizer")
 list(APPEND library_list "unofficial::joltphysics::Jolt")
 list(APPEND library_list "enkiTS::enkiTS")
 list(APPEND library_list "steam-audio::phonon")
+list(APPEND library_list "Vulkan::Headers")
+list(APPEND library_list "GPUOpen::VulkanMemoryAllocator")
 
 set(engine_shader_include_dir "${CMAKE_CURRENT_LIST_DIR}/include")
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -49,7 +49,7 @@
   "overrides": [
     {
       "name": "cgltf",
-      "version": "1.13"
+      "version": "1.14"
     },
     {
       "name": "enkits",
@@ -78,7 +78,7 @@
     },
     {
       "name": "mimalloc",
-      "version": "2.1.2"
+      "version": "2.1.7"
     },
     {
       "name": "sdl3",
@@ -94,15 +94,15 @@
     },
     {
       "name": "tracy",
-      "version": "0.10.0"
+      "version": "0.11.0"
     },
     {
       "name": "volk",
-      "version": "1.3.275.0"
+      "version": "1.3.290.0"
     },
     {
       "name": "vulkan-memory-allocator",
-      "version": "3.0.1"
+      "version": "3.1.0"
     }
   ]
 }