Browse Source

revert to qt 6.7.3 and moltenvk

pull/147/head
Maufeat 8 months ago
committed by crueter
parent
commit
ba988211dd
  1. 2
      CMakeLists.txt
  2. 2
      CMakeModules/DownloadExternals.cmake
  3. 2
      src/yuzu/CMakeLists.txt

2
CMakeLists.txt

@ -499,7 +499,7 @@ add_subdirectory(externals)
if (ENABLE_QT)
if (YUZU_USE_BUNDLED_QT)
download_qt(6.8.3)
download_qt(6.7.3)
else()
message(STATUS "Using system Qt")
if (NOT Qt6_DIR)

2
CMakeModules/DownloadExternals.cmake

@ -221,7 +221,7 @@ set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
if (NOT EXISTS ${MOLTENVK_DIR})
if (NOT EXISTS ${MOLTENVK_TAR})
file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10-rc2/MoltenVK-all.tar
file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.11-artifacts/MoltenVK-all.tar
${MOLTENVK_TAR} SHOW_PROGRESS)
endif()

2
src/yuzu/CMakeLists.txt

@ -374,7 +374,7 @@ if (APPLE)
if (NOT USE_SYSTEM_MOLTENVK)
set(MOLTENVK_PLATFORM "macOS")
set(MOLTENVK_VERSION "v1.3.0")
set(MOLTENVK_VERSION "v1.2.11-artifacts")
download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
endif()
find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)

Loading…
Cancel
Save