diff options
| author | 2019-01-10 17:04:38 -0500 | |
|---|---|---|
| committer | 2019-01-10 17:04:38 -0500 | |
| commit | 83e8ad23310937bb72f4412c15f45231a19202f7 (patch) | |
| tree | 80301af69b14a701f16e21d41ced436850085031 /CMakeModules | |
| parent | Merge pull request #2010 from ReinUsesLisp/gmem (diff) | |
| parent | build: Copy web engine resources to correct location (diff) | |
| download | yuzu-83e8ad23310937bb72f4412c15f45231a19202f7.tar.gz yuzu-83e8ad23310937bb72f4412c15f45231a19202f7.tar.xz yuzu-83e8ad23310937bb72f4412c15f45231a19202f7.zip | |
Merge pull request #1939 from DarkLordZach/web-applet
applets: Implement HLE web browser applet (LibAppletOff)
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index aaf80b77b..4fef66659 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -5,6 +5,7 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") |
| 6 | set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") | 6 | set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") |
| 7 | set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") | 7 | set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") |
| 8 | set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") | ||
| 8 | set(PLATFORMS ${DLL_DEST}platforms/) | 9 | set(PLATFORMS ${DLL_DEST}platforms/) |
| 9 | set(STYLES ${DLL_DEST}styles/) | 10 | set(STYLES ${DLL_DEST}styles/) |
| 10 | set(IMAGEFORMATS ${DLL_DEST}imageformats/) | 11 | set(IMAGEFORMATS ${DLL_DEST}imageformats/) |
| @@ -17,6 +18,31 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 17 | Qt5OpenGL$<$<CONFIG:Debug>:d>.* | 18 | Qt5OpenGL$<$<CONFIG:Debug>:d>.* |
| 18 | Qt5Widgets$<$<CONFIG:Debug>:d>.* | 19 | Qt5Widgets$<$<CONFIG:Debug>:d>.* |
| 19 | ) | 20 | ) |
| 21 | |||
| 22 | if (YUZU_USE_QT_WEB_ENGINE) | ||
| 23 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} | ||
| 24 | Qt5Network$<$<CONFIG:Debug>:d>.* | ||
| 25 | Qt5Positioning$<$<CONFIG:Debug>:d>.* | ||
| 26 | Qt5PrintSupport$<$<CONFIG:Debug>:d>.* | ||
| 27 | Qt5Qml$<$<CONFIG:Debug>:d>.* | ||
| 28 | Qt5Quick$<$<CONFIG:Debug>:d>.* | ||
| 29 | Qt5QuickWidgets$<$<CONFIG:Debug>:d>.* | ||
| 30 | Qt5WebChannel$<$<CONFIG:Debug>:d>.* | ||
| 31 | Qt5WebEngine$<$<CONFIG:Debug>:d>.* | ||
| 32 | Qt5WebEngineCore$<$<CONFIG:Debug>:d>.* | ||
| 33 | Qt5WebEngineWidgets$<$<CONFIG:Debug>:d>.* | ||
| 34 | QtWebEngineProcess$<$<CONFIG:Debug>:d>.* | ||
| 35 | ) | ||
| 36 | |||
| 37 | windows_copy_files(${target_dir} ${Qt5_RESOURCES_DIR} ${DLL_DEST} | ||
| 38 | qtwebengine_resources.pak | ||
| 39 | qtwebengine_devtools_resources.pak | ||
| 40 | qtwebengine_resources_100p.pak | ||
| 41 | qtwebengine_resources_200p.pak | ||
| 42 | icudtl.dat | ||
| 43 | ) | ||
| 44 | endif () | ||
| 45 | |||
| 20 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) | 46 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) |
| 21 | windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) | 47 | windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) |
| 22 | windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$<CONFIG:Debug>:d>.*) | 48 | windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$<CONFIG:Debug>:d>.*) |