From 1c7a860bb046a5f00db18246ee65b91eb5eccadc Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Sun, 27 Jul 2025 21:24:56 -0400
Subject: [PATCH] fix vk

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 CMakeLists.txt                                | 16 ++++-----
 externals/CMakeLists.txt                      | 34 ++++++++++++-------
 src/audio_core/externals/cubeb/CMakeLists.txt |  1 +
 src/video_core/CMakeLists.txt                 |  3 +-
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b33c211df..d131977631 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,9 +85,9 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-        option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
+    option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
 else()
-        option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
+    option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 endif()
 
 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
@@ -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)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 9d9f7058e2..5dfdb9157c 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -154,27 +154,35 @@ 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(
-        NAME VulkanHeaders
-        VERSION 1.3.274
-        GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git"
-        GIT_TAG 89268a6d17
-    )
+    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
+)
+
 # Vulkan-Utility-Libraries
 if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
-    CPMAddPackage(
-        NAME VulkanUtilityLibraries
-        GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git"
-        GIT_TAG df2e358152
-    )
+    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
+)
+
 # SPIRV-Tools
 if (YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS)
     set(SPIRV_SKIP_EXECUTABLES ON)
diff --git a/src/audio_core/externals/cubeb/CMakeLists.txt b/src/audio_core/externals/cubeb/CMakeLists.txt
index 5211f15347..789b3a9a6f 100644
--- a/src/audio_core/externals/cubeb/CMakeLists.txt
+++ b/src/audio_core/externals/cubeb/CMakeLists.txt
@@ -24,6 +24,7 @@ if (cubeb_ADDED)
     else()
         target_compile_options(cubeb PRIVATE
             /wd4456
+            /wd4458
         )
     endif()
 endif()
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 6c0dda296e..34c9853a6d 100644
--- a/src/video_core/CMakeLists.txt
+++ b/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})