diff --git a/CMakeModules/Findzstd.cmake b/CMakeModules/Findzstd.cmake index 60e706328d..2afdb56a8c 100644 --- a/CMakeModules/Findzstd.cmake +++ b/CMakeModules/Findzstd.cmake @@ -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() diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index eebc4d5841..1350bccf2e 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -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 #include diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp index 1846be5455..d6160be55b 100644 --- a/src/yuzu/main_window.cpp +++ b/src/yuzu/main_window.cpp @@ -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 #endif