fix vk

Signed-off-by: crueter <crueter@eden-emu.dev>

CMakeLists.txt

@@ -389,13 +389,13 @@ find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
 
-if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    find_package(VulkanHeaders 1.3.274)
-endif()
+# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
+#     find_package(VulkanHeaders 1.3.274)
+# endif()
 
-if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
-    find_package(VulkanUtilityLibraries)
-endif()
+# if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
+#     find_package(VulkanUtilityLibraries)
+# endif()
 
 if (NOT YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS)
     find_package(PkgConfig REQUIRED)

externals/CMakeLists.txt

@@ -154,26 +154,34 @@ if (YUZU_USE_BUNDLED_FFMPEG)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 endif()
 
-# TODO(crueter): System vk headers is broken (at least on gentoo lol)
-
 # Vulkan-Headers
 if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    CPMAddPackage(
+    set(CPM_USE_LOCAL_PACKAGES OFF)
+else()
+    set(CPM_USE_LOCAL_PACKAGES ON)
+endif()
+
+# TODO(crueter): System vk-headers are too new for externals vk-util
+
+CPMAddPackage(
     NAME VulkanHeaders
     VERSION 1.3.274
     GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git"
     GIT_TAG 89268a6d17
-    )
-endif()
+)
 
 # Vulkan-Utility-Libraries
 if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
-    CPMAddPackage(
+    set(CPM_USE_LOCAL_PACKAGES OFF)
+else()
+    set(CPM_USE_LOCAL_PACKAGES ON)
+endif()
+
+CPMAddPackage(
     NAME VulkanUtilityLibraries
     GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git"
     GIT_TAG df2e358152
-    )
-endif()
+)
 
 # SPIRV-Tools
 if (YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS)

src/audio_core/externals/cubeb/CMakeLists.txt

@@ -24,6 +24,7 @@ if (cubeb_ADDED)
     else()
         target_compile_options(cubeb PRIVATE
             /wd4456
+            /wd4458
         )
     endif()
 endif()

src/video_core/CMakeLists.txt

@@ -328,7 +328,8 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
 
 add_dependencies(video_core host_shaders)
 target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
-target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
+
+target_link_libraries(video_core PRIVATE sirit Vulkan::Headers VulkanUtilityHeaders GPUOpen::VulkanMemoryAllocator)
 
 if (ENABLE_NSIGHT_AFTERMATH)
     if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})