Merge branch 'patch-4' into 'dev'

Fixed building on Debian Trixie

See merge request suyu-emu/suyu!12

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 "$<TARGET_FILE_DIR:${target_dir}>/")
-        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/)

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
 
 # Modified by JuanCStar on 2024/03/06