From b5fc1592ac7fd892fe758efb5e77f9964fe1c885 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Mon, 10 Nov 2025 02:59:15 -0500
Subject: [PATCH] fix build

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 src/tests/common/bit_field.cpp | 3 +++
 src/yuzu/CMakeLists.txt        | 8 ++++++++
 src/yuzu/main_window.cpp       | 8 +++++---
 src/yuzu_cmd/yuzu.cpp          | 6 +++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/tests/common/bit_field.cpp b/src/tests/common/bit_field.cpp
index 75e990ecd9..eee14ffbbf 100644
--- a/src/tests/common/bit_field.cpp
+++ b/src/tests/common/bit_field.cpp
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: 2019 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#define VMA_IMPLEMENTATION
+#include "video_core/vulkan_common/vma.h"
+
 #include <array>
 #include <cstring>
 #include <type_traits>
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 79453e4570..c9abff6e26 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -447,4 +447,12 @@ if (YUZU_ROOM)
 target_link_libraries(yuzu PRIVATE Qt6::Widgets)
 endif()
 
+if (YUZU_STATIC_BUILD)
+    # needed for vma
+    target_compile_options(yuzu PRIVATE
+        -Wno-conversion
+        -Wno-unused-variable
+        -Wno-unused-parameter
+        -Wno-missing-field-initializers)
+endif()
 create_target_directory_groups(yuzu)
diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp
index d6160be55b..a5e692c8d1 100644
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -3,9 +3,6 @@
 
 #ifdef QT_STATICPLUGIN
 #undef VMA_IMPLEMENTATION
-#else
-#define VMA_IMPLEMENTATION
-#include "video_core/vulkan_common/vma.h"
 #endif
 
 #include "common/fs/ryujinx_compat.h"
@@ -4906,3 +4903,8 @@ void VolumeButton::ResetMultiplier() {
 #ifdef main
 #undef main
 #endif
+
+#ifndef QT_STATICPLUGIN
+#define VMA_IMPLEMENTATION
+#include "video_core/vulkan_common/vma.h"
+#endif
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index b7b98f7bef..6ec6f973bb 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -4,9 +4,6 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#define VMA_IMPLEMENTATION
-#include "video_core/vulkan_common/vma.h"
-
 #include <iostream>
 #include <memory>
 #include <regex>
@@ -453,3 +450,6 @@ int main(int argc, char** argv) {
     detached_tasks.WaitForAllTasks();
     return 0;
 }
+
+#define VMA_IMPLEMENTATION
+#include "video_core/vulkan_common/vma.h"