diff options
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index 1e9810bba..2598b9b60 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -6,9 +6,9 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 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(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") |
| 9 | set(PLATFORMS ${DLL_DEST}platforms/) | 9 | set(PLATFORMS ${DLL_DEST}plugins/platforms/) |
| 10 | set(STYLES ${DLL_DEST}styles/) | 10 | set(STYLES ${DLL_DEST}plugins/styles/) |
| 11 | set(IMAGEFORMATS ${DLL_DEST}imageformats/) | 11 | set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) |
| 12 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} | 12 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} |
| 13 | icudt*.dll | 13 | icudt*.dll |
| 14 | icuin*.dll | 14 | icuin*.dll |
| @@ -42,11 +42,15 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 42 | icudtl.dat | 42 | icudtl.dat |
| 43 | ) | 43 | ) |
| 44 | endif () | 44 | endif () |
| 45 | |||
| 46 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) | 45 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) |
| 47 | windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) | 46 | windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) |
| 48 | windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} | 47 | windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} |
| 49 | qjpeg$<$<CONFIG:Debug>:d>.* | 48 | qjpeg$<$<CONFIG:Debug>:d>.* |
| 50 | qgif$<$<CONFIG:Debug>:d>.* | 49 | qgif$<$<CONFIG:Debug>:d>.* |
| 51 | ) | 50 | ) |
| 51 | # Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder. | ||
| 52 | # This way it'll look for plugins in the root/plugins/ folder | ||
| 53 | add_custom_command(TARGET yuzu POST_BUILD | ||
| 54 | COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf | ||
| 55 | ) | ||
| 52 | endfunction(copy_yuzu_Qt5_deps) | 56 | endfunction(copy_yuzu_Qt5_deps) |