diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8635d91f..871e0ca1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -304,7 +304,7 @@ endif() | |||
| 304 | if (ENABLE_QT) | 304 | if (ENABLE_QT) |
| 305 | if (YUZU_USE_BUNDLED_QT) | 305 | if (YUZU_USE_BUNDLED_QT) |
| 306 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) | 306 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) |
| 307 | set(QT_VER qt-5.10.0-msvc2015_64) | 307 | set(QT_VER qt-5.12.0-msvc2017_64) |
| 308 | else() | 308 | else() |
| 309 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") | 309 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |
| 310 | endif() | 310 | endif() |
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index a1ad8d8fb..db4cd88b6 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -16,13 +16,13 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 16 | icuuc*.dll | 16 | icuuc*.dll |
| 17 | Qt5Core$<$<CONFIG:Debug>:d>.* | 17 | Qt5Core$<$<CONFIG:Debug>:d>.* |
| 18 | Qt5Gui$<$<CONFIG:Debug>:d>.* | 18 | Qt5Gui$<$<CONFIG:Debug>:d>.* |
| 19 | Qt5Network$<$<CONFIG:Debug>:d>.* | ||
| 20 | Qt5OpenGL$<$<CONFIG:Debug>:d>.* | 19 | Qt5OpenGL$<$<CONFIG:Debug>:d>.* |
| 21 | Qt5Widgets$<$<CONFIG:Debug>:d>.* | 20 | Qt5Widgets$<$<CONFIG:Debug>:d>.* |
| 22 | ) | 21 | ) |
| 23 | 22 | ||
| 24 | if (YUZU_USE_QT_WEB_ENGINE) | 23 | if (YUZU_USE_QT_WEB_ENGINE) |
| 25 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} | 24 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} |
| 25 | Qt5Network$<$<CONFIG:Debug>:d>.* | ||
| 26 | Qt5Positioning$<$<CONFIG:Debug>:d>.* | 26 | Qt5Positioning$<$<CONFIG:Debug>:d>.* |
| 27 | Qt5PrintSupport$<$<CONFIG:Debug>:d>.* | 27 | Qt5PrintSupport$<$<CONFIG:Debug>:d>.* |
| 28 | Qt5Qml$<$<CONFIG:Debug>:d>.* | 28 | Qt5Qml$<$<CONFIG:Debug>:d>.* |