Browse Source
fix qt, zstd
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
3 changed files with
13 additions and
1 deletions
-
CMakeModules/Findzstd.cmake
-
src/android/app/src/main/jni/native.cpp
-
src/yuzu/main_window.cpp
|
|
|
@ -28,6 +28,12 @@ if (zstd_FOUND AND NOT TARGET zstd::zstd) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
get_target_property(ZSTD_TARGET zstd::zstd ALIASED_TARGET) |
|
|
|
|
|
|
|
if (NOT TARGET zstd::libzstd) |
|
|
|
add_library(zstd::libzstd ALIAS zstd::zstd) |
|
|
|
if (ZSTD_TARGET) |
|
|
|
add_library(zstd::libzstd ALIAS ${ZSTD_TARGET}) |
|
|
|
else() |
|
|
|
add_library(zstd::libzstd ALIAS zstd::zstd) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
@ -4,6 +4,8 @@ |
|
|
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
|
|
|
#define VMA_IMPLEMENTATION
|
|
|
|
#include "video_core/vulkan_common/vma.h"
|
|
|
|
|
|
|
|
#include <codecvt>
|
|
|
|
#include <locale>
|
|
|
|
|
|
|
|
@ -3,6 +3,9 @@ |
|
|
|
|
|
|
|
#ifdef QT_STATICPLUGIN
|
|
|
|
#undef VMA_IMPLEMENTATION
|
|
|
|
#else
|
|
|
|
#define VMA_IMPLEMENTATION
|
|
|
|
#include "video_core/vulkan_common/vma.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "common/fs/ryujinx_compat.h"
|
|
|
|
@ -48,6 +51,7 @@ |
|
|
|
|
|
|
|
// Qt Stuff //
|
|
|
|
#define QT_NO_OPENGL
|
|
|
|
|
|
|
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
|
|
|
|
#include <QStyleHints>
|
|
|
|
#endif
|
|
|
|
|
