Use the correct directory for Qt Plugins (#5148)
This commit is contained in:
parent
1ff8d002a9
commit
f8d717bc7a
|
@ -6,10 +6,10 @@ function(copy_citra_Qt5_deps target_dir)
|
||||||
set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/")
|
set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/")
|
||||||
set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/")
|
set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/")
|
||||||
set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/")
|
set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/")
|
||||||
set(PLATFORMS ${DLL_DEST}platforms/)
|
set(PLATFORMS ${DLL_DEST}plugins/platforms/)
|
||||||
set(MEDIASERVICE ${DLL_DEST}mediaservice/)
|
set(MEDIASERVICE ${DLL_DEST}plugins/mediaservice/)
|
||||||
set(STYLES ${DLL_DEST}styles/)
|
set(STYLES ${DLL_DEST}plugins/styles/)
|
||||||
set(IMAGEFORMATS ${DLL_DEST}imageformats/)
|
set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/)
|
||||||
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
||||||
icudt*.dll
|
icudt*.dll
|
||||||
icuin*.dll
|
icuin*.dll
|
||||||
|
@ -38,4 +38,10 @@ function(copy_citra_Qt5_deps target_dir)
|
||||||
qwbmp$<$<CONFIG:Debug>:d>.dll
|
qwbmp$<$<CONFIG:Debug>:d>.dll
|
||||||
qwebp$<$<CONFIG:Debug>:d>.dll
|
qwebp$<$<CONFIG:Debug>:d>.dll
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 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 citra-qt POST_BUILD
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf
|
||||||
|
)
|
||||||
endfunction(copy_citra_Qt5_deps)
|
endfunction(copy_citra_Qt5_deps)
|
||||||
|
|
Reference in New Issue