diff options
| author | James Rowe <jroweboy@gmail.com> | 2020-03-24 01:43:01 +0100 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2020-03-24 01:51:46 +0100 |
| commit | 6ca8637d4c42c9d9001e59092f62e56e99c1fe9c (patch) | |
| tree | 8cdc97f3101a4ea66f7f4c0953ed7c79304c7e03 /CMakeModules | |
| parent | Merge pull request #3543 from ReinUsesLisp/gl-depth-range (diff) | |
| download | yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar.gz yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar.bz2 yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar.lz yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar.xz yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.tar.zst yuzu-6ca8637d4c42c9d9001e59092f62e56e99c1fe9c.zip | |
Diffstat (limited to 'CMakeModules')
| -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) set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") - set(PLATFORMS ${DLL_DEST}platforms/) - set(STYLES ${DLL_DEST}styles/) - set(IMAGEFORMATS ${DLL_DEST}imageformats/) + set(PLATFORMS ${DLL_DEST}plugins/platforms/) + set(STYLES ${DLL_DEST}plugins/styles/) + set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll @@ -42,11 +42,15 @@ function(copy_yuzu_Qt5_deps target_dir) icudtl.dat ) endif () - windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$<CONFIG:Debug>:d>.* qgif$<$<CONFIG:Debug>:d>.* ) + # Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder. + # This way it'll look for plugins in the root/plugins/ folder + add_custom_command(TARGET yuzu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf + ) endfunction(copy_yuzu_Qt5_deps) |