From 6f3fc32a93adce1640807112f6cc8b941d631803 Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Fri, 7 Oct 2022 11:43:53 +0300
Subject: [PATCH] code: Address build issues

---
 externals/CMakeLists.txt                              | 4 ++++
 src/citra/citra.cpp                                   | 1 +
 src/citra_qt/CMakeLists.txt                           | 4 ++--
 src/video_core/CMakeLists.txt                         | 3 +--
 src/video_core/renderer_vulkan/vk_task_scheduler.cpp  | 4 ++--
 src/video_core/renderer_vulkan/vk_texture_runtime.cpp | 1 +
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 4711bf8f5..44eadb53b 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -169,3 +169,7 @@ endif()
 add_library(vma INTERFACE)
 target_include_directories(vma INTERFACE ./vma)
 
+# vulkan-headers
+add_library(vulkan-headers INTERFACE)
+target_include_directories(vulkan-headers INTERFACE ./vulkan-headers/include)
+
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index b76d5fd8b..ebb0726cc 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -39,6 +39,7 @@
 #ifdef _WIN32
 // windows.h needs to be included before shellapi.h
 #include <windows.h>
+
 #include <shellapi.h>
 
 extern "C" {
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 32647c2f2..55c5e5e0e 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -260,7 +260,7 @@ endif()
 create_target_directory_groups(citra-qt)
 
 target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
-target_link_libraries(citra-qt PRIVATE Boost::boost glad vma nihstro-headers Qt5::Widgets Qt5::Multimedia)
+target_link_libraries(citra-qt PRIVATE Boost::boost glad vma vulkan-headers nihstro-headers Qt5::Widgets Qt5::Multimedia)
 target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 if (NOT WIN32)
@@ -307,7 +307,7 @@ if(UNIX AND NOT APPLE)
     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 endif()
 
-if (MSVC OR MINGW)
+if (MSVC)
     include(CopyCitraQt5Deps)
     include(CopyCitraSDLDeps)
     copy_citra_Qt5_deps(citra-qt)
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index f0f27fbda..a8a5ca785 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -188,9 +188,8 @@ endif()
 create_target_directory_groups(video_core)
 
 # Include Vulkan headers
-target_include_directories(video_core PRIVATE ../../externals/vulkan-headers/include)
 target_link_libraries(video_core PUBLIC common core)
-target_link_libraries(video_core PRIVATE glad vma glm::glm SPIRV glslang nihstro-headers Boost::serialization)
+target_link_libraries(video_core PRIVATE glad vma vulkan-headers glm::glm SPIRV glslang nihstro-headers Boost::serialization)
 set_target_properties(video_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
 
 if (ARCHITECTURE_x86_64)
diff --git a/src/video_core/renderer_vulkan/vk_task_scheduler.cpp b/src/video_core/renderer_vulkan/vk_task_scheduler.cpp
index 346e6f84a..fb601b6b7 100644
--- a/src/video_core/renderer_vulkan/vk_task_scheduler.cpp
+++ b/src/video_core/renderer_vulkan/vk_task_scheduler.cpp
@@ -150,11 +150,11 @@ void TaskScheduler::Submit(SubmitMode mode) {
     const bool swapchain_sync = True(mode & SubmitMode::SwapchainSynced);
     if (instance.IsTimelineSemaphoreSupported()) {
         const u32 wait_semaphore_count = swapchain_sync ? 2u : 1u;
-        const std::array wait_values{command.fence_counter - 1, 1ul};
+        const std::array wait_values{command.fence_counter - 1, u64(1)};
         const std::array wait_semaphores{timeline, command.image_acquired};
 
         const u32 signal_semaphore_count = swapchain_sync ? 2u : 1u;
-        const std::array signal_values{command.fence_counter, 0ul};
+        const std::array signal_values{command.fence_counter, u64(0)};
         const std::array signal_semaphores{timeline, command.present_ready};
 
         const vk::TimelineSemaphoreSubmitInfoKHR timeline_si = {
diff --git a/src/video_core/renderer_vulkan/vk_texture_runtime.cpp b/src/video_core/renderer_vulkan/vk_texture_runtime.cpp
index a28ba8c73..d389d32d6 100644
--- a/src/video_core/renderer_vulkan/vk_texture_runtime.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_runtime.cpp
@@ -8,6 +8,7 @@
 #include "video_core/renderer_vulkan/vk_renderpass_cache.h"
 #include "video_core/renderer_vulkan/vk_task_scheduler.h"
 #include "video_core/renderer_vulkan/vk_texture_runtime.h"
+
 #include <vulkan/vulkan_format_traits.hpp>
 
 namespace Vulkan {