Răsfoiți Sursa

Update Qt MSVC external to 5.12.0

Zach Hilman 7 ani în urmă
părinte
comite
15501477e7
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      CMakeLists.txt
  2. 1 1
      CMakeModules/CopyYuzuQt5Deps.cmake

+ 1 - 1
CMakeLists.txt

@@ -304,7 +304,7 @@ endif()
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
         if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64)
-            set(QT_VER qt-5.10.0-msvc2015_64)
+            set(QT_VER qt-5.12.0-msvc2017_64)
         else()
             message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
         endif()

+ 1 - 1
CMakeModules/CopyYuzuQt5Deps.cmake

@@ -16,13 +16,13 @@ function(copy_yuzu_Qt5_deps target_dir)
         icuuc*.dll
         Qt5Core$<$<CONFIG:Debug>:d>.*
         Qt5Gui$<$<CONFIG:Debug>:d>.*
-        Qt5Network$<$<CONFIG:Debug>:d>.*
         Qt5OpenGL$<$<CONFIG:Debug>:d>.*
         Qt5Widgets$<$<CONFIG:Debug>:d>.*
     )
 
     if (YUZU_USE_QT_WEB_ENGINE)
         windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} 
+            Qt5Network$<$<CONFIG:Debug>:d>.*
             Qt5Positioning$<$<CONFIG:Debug>:d>.*
             Qt5PrintSupport$<$<CONFIG:Debug>:d>.*
             Qt5Qml$<$<CONFIG:Debug>:d>.*