diff options
| author | 2022-07-24 13:31:28 -0400 | |
|---|---|---|
| committer | 2022-07-24 13:31:28 -0400 | |
| commit | 5af06d14337a61d9ed1093079d13f68cbb1f5451 (patch) | |
| tree | 88df3fada076b04c2ab2da8972d1d785f492b520 /CMakeModules | |
| parent | Merge pull request #8545 from Kelebek1/Audio (diff) | |
| parent | yuzu: Add webcam support and rebase to latest master (diff) | |
| download | yuzu-5af06d14337a61d9ed1093079d13f68cbb1f5451.tar.gz yuzu-5af06d14337a61d9ed1093079d13f68cbb1f5451.tar.xz yuzu-5af06d14337a61d9ed1093079d13f68cbb1f5451.zip | |
Merge pull request #8484 from german77/irs_release
service: irs: Add camera support, split processors and implement ImageTransferProcessor
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index 0c27d51a6..6c5044caa 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -10,11 +10,13 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 10 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | 10 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") |
| 11 | set(Qt5_PLATFORMTHEMES_DIR "${Qt5_DIR}/../../../plugins/platformthemes/") | 11 | set(Qt5_PLATFORMTHEMES_DIR "${Qt5_DIR}/../../../plugins/platformthemes/") |
| 12 | set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_DIR}/../../../plugins/platforminputcontexts/") | 12 | set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_DIR}/../../../plugins/platforminputcontexts/") |
| 13 | set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/") | ||
| 13 | set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_DIR}/../../../plugins/xcbglintegrations/") | 14 | set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_DIR}/../../../plugins/xcbglintegrations/") |
| 14 | set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") | 15 | set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") |
| 15 | set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") | 16 | set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") |
| 16 | set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") | 17 | set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") |
| 17 | set(PLATFORMS ${DLL_DEST}plugins/platforms/) | 18 | set(PLATFORMS ${DLL_DEST}plugins/platforms/) |
| 19 | set(MEDIASERVICE ${DLL_DEST}mediaservice/) | ||
| 18 | set(STYLES ${DLL_DEST}plugins/styles/) | 20 | set(STYLES ${DLL_DEST}plugins/styles/) |
| 19 | set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) | 21 | set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) |
| 20 | if (MSVC) | 22 | if (MSVC) |
| @@ -22,6 +24,8 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 22 | Qt5Core$<$<CONFIG:Debug>:d>.* | 24 | Qt5Core$<$<CONFIG:Debug>:d>.* |
| 23 | Qt5Gui$<$<CONFIG:Debug>:d>.* | 25 | Qt5Gui$<$<CONFIG:Debug>:d>.* |
| 24 | Qt5Widgets$<$<CONFIG:Debug>:d>.* | 26 | Qt5Widgets$<$<CONFIG:Debug>:d>.* |
| 27 | Qt5Multimedia$<$<CONFIG:Debug>:d>.* | ||
| 28 | Qt5Network$<$<CONFIG:Debug>:d>.* | ||
| 25 | ) | 29 | ) |
| 26 | 30 | ||
| 27 | if (YUZU_USE_QT_WEB_ENGINE) | 31 | if (YUZU_USE_QT_WEB_ENGINE) |
| @@ -53,6 +57,10 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 53 | qjpeg$<$<CONFIG:Debug>:d>.* | 57 | qjpeg$<$<CONFIG:Debug>:d>.* |
| 54 | qgif$<$<CONFIG:Debug>:d>.* | 58 | qgif$<$<CONFIG:Debug>:d>.* |
| 55 | ) | 59 | ) |
| 60 | windows_copy_files(yuzu ${Qt5_MEDIASERVICE_DIR} ${MEDIASERVICE} | ||
| 61 | dsengine$<$<CONFIG:Debug>:d>.* | ||
| 62 | wmfengine$<$<CONFIG:Debug>:d>.* | ||
| 63 | ) | ||
| 56 | else() | 64 | else() |
| 57 | set(Qt5_DLLS | 65 | set(Qt5_DLLS |
| 58 | "${Qt5_DLL_DIR}libQt5Core.so.5" | 66 | "${Qt5_DLL_DIR}libQt5Core.so.5" |