diff options
author | bunnei <bunneidev@gmail.com> | 2020-03-26 05:50:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 05:50:06 +0100 |
commit | 8244536f7aa14ac576b9530b3a7a293027896a27 (patch) | |
tree | b80a5ac6d430c6a66011475d634a3e33f354a2b4 | |
parent | Merge pull request #3544 from makigumo/myfork/patch-2 (diff) | |
parent | Use the correct directory for Qt Plugins (diff) | |
download | yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar.gz yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar.bz2 yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar.lz yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar.xz yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.tar.zst yuzu-8244536f7aa14ac576b9530b3a7a293027896a27.zip |
-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) |