From 89d88442c0710145590f2b68358249afd8629a0a Mon Sep 17 00:00:00 2001 From: niansa Date: Tue, 5 Mar 2024 18:54:46 +0100 Subject: [PATCH 1/2] Fixed building on Debian Trixie --- CMakeModules/CopyYuzuQt5Deps.cmake | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index b3a65c3476..614499a236 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -3,21 +3,25 @@ function(copy_yuzu_Qt5_deps target_dir) include(WindowsCopyFiles) + set(Qt5_BASE_PATH "${Qt5_DIR}/../../..") + if (NOT EXISTS "${Qt5_BASE_PATH}/bin") + set(Qt5_BASE_PATH "${Qt5_DIR}/../../qt5") + endif() if (MSVC) set(DLL_DEST "$/") - set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") + set(Qt5_DLL_DIR "${Qt5_BASE_PATH}/bin") else() set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") - set(Qt5_DLL_DIR "${Qt5_DIR}/../../../lib/") + set(Qt5_DLL_DIR "${Qt5_BASE_PATH}/lib/") endif() - set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") - set(Qt5_PLATFORMTHEMES_DIR "${Qt5_DIR}/../../../plugins/platformthemes/") - set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_DIR}/../../../plugins/platforminputcontexts/") - set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/") - set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_DIR}/../../../plugins/xcbglintegrations/") - set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") - set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") - set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") + set(Qt5_PLATFORMS_DIR "${Qt5_BASE_PATH}/plugins/platforms/") + set(Qt5_PLATFORMTHEMES_DIR "${Qt5_BASE_PATH}/plugins/platformthemes/") + set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_BASE_PATH}/plugins/platforminputcontexts/") + set(Qt5_MEDIASERVICE_DIR "${Qt5_BASE_PATH}/plugins/mediaservice/") + set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_BASE_PATH}/plugins/xcbglintegrations/") + set(Qt5_STYLES_DIR "${Qt5_BASE_PATH}/plugins/styles/") + set(Qt5_IMAGEFORMATS_DIR "${Qt5_BASE_PATH}/plugins/imageformats/") + set(Qt5_RESOURCES_DIR "${Qt5_BASE_PATH}/resources/") set(PLATFORMS ${DLL_DEST}plugins/platforms/) set(MEDIASERVICE ${DLL_DEST}mediaservice/) set(STYLES ${DLL_DEST}plugins/styles/) From 95cf47be69fcfbb02fd32ef45d394f4cdc75acfa Mon Sep 17 00:00:00 2001 From: niansa Date: Tue, 5 Mar 2024 18:58:53 +0100 Subject: [PATCH 2/2] Updated copyright --- src/yuzu/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 0259a8c293..ddfe38eb7c 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 Suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later set(CMAKE_AUTOMOC ON)