Browse Source
fix build
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2994/head
crueter
3 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
19 additions and
6 deletions
-
src/tests/common/bit_field.cpp
-
src/yuzu/CMakeLists.txt
-
src/yuzu/main_window.cpp
-
src/yuzu_cmd/yuzu.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>
|
|
|
|
|
|
|
|
@ -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) |
|
|
|
@ -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
|
|
|
|
@ -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"
|