diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8a44c5929..2ce102aec 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -57,20 +57,20 @@ jobs: shell: bash run: | DEPS_VERSION=$(cat dep/PREBUILT-VERSION) - curl --fail --retry 5 --retry-all-errors -LO "https://github.com/duckstation/dependencies/releases/download/$DEPS_VERSION/deps-windows-x64.7z" + curl --fail --retry 5 --retry-all-errors -LO "https://github.com/duckstation/dependencies/releases/download/$DEPS_VERSION/deps-windows-qt-installer-x64.7z" sha256sum --check --ignore-missing dep/PREBUILT-SHA256SUMS - 7z x -odep/prebuilt deps-windows-x64.7z - rm deps-windows-x64.7z + 7z x -odep/prebuilt deps-windows-qt-installer-x64.7z + rm deps-windows-qt-installer-x64.7z - name: Download ARM64 Dependencies shell: bash if: matrix.arch == 'arm64' run: | DEPS_VERSION=$(cat dep/PREBUILT-VERSION) - curl --fail --retry 5 --retry-all-errors -LO "https://github.com/duckstation/dependencies/releases/download/$DEPS_VERSION/deps-windows-arm64.7z" + curl --fail --retry 5 --retry-all-errors -LO "https://github.com/duckstation/dependencies/releases/download/$DEPS_VERSION/deps-windows-qt-installer-arm64.7z" sha256sum --check --ignore-missing dep/PREBUILT-SHA256SUMS - 7z x -odep/prebuilt deps-windows-arm64.7z - rm deps-windows-arm64.7z + 7z x -odep/prebuilt deps-windows-qt-installer-arm64.7z + rm deps-windows-qt-installer-arm64.7z - name: Download Patch Archives shell: cmd diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index 128da4770..12e075ba2 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -80,17 +80,17 @@ find_package(Shaderc 2026.3 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/Shaderc") find_package(spirv_cross_c_shared REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/share/spirv_cross_c_shared/cmake") -find_package(SDL3 3.4.14 REQUIRED +find_package(SDL3 3.4.16 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/SDL3") # All our builds include Qt, so this is not a problem. set(QT_NO_PRIVATE_MODULE_WARNING ON) if(LINUX) - find_package(Qt6 6.11.1 REQUIRED + find_package(Qt6 6.11.2 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/Qt6" COMPONENTS Core Gui GuiPrivate Widgets LinguistTools DBus) else() - find_package(Qt6 6.11.1 REQUIRED + find_package(Qt6 6.11.2 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/Qt6" COMPONENTS Core Gui GuiPrivate Widgets LinguistTools) endif() diff --git a/dep/PREBUILT-SHA256SUMS b/dep/PREBUILT-SHA256SUMS index c53ae967a..303feb0f5 100644 --- a/dep/PREBUILT-SHA256SUMS +++ b/dep/PREBUILT-SHA256SUMS @@ -1,6 +1,8 @@ -bf24f7416d95bc434789f1e9aec043fb336aa95430ab9c256fa9341d8ff8622f *deps-linux-cross-arm64.tar.xz -b0d3ffa9220b080d64544d020784af20b6e8bd439eb5d6db6825d90af7b5cd48 *deps-linux-cross-armhf.tar.xz -66ee41d65ef6d8826bcbbb74de85670173e1e7a0acf9f277f8ce938449bc0b17 *deps-linux-x64.tar.xz -1f1fdbca7aa8be707c645995bc84a51d092340ae7e7c263ee5518f0ae17b100b *deps-macos-universal.tar.xz -acf6688105c7f997f71f09e3f9a0f74e6eb4c58f74c3f1445884848fc946ea8e *deps-windows-arm64.7z -e1c4dcb10b579f6271d0e39e5055ca17f3de8d93e3f3cd589a4ab14a72fa6e52 *deps-windows-x64.7z +43484375df7ecb6f6bd0ff7d5d7ed95ee52828503e5c32c05466a10b1ad6e131 *deps-linux-cross-arm64.tar.xz +325be573c8f295ac2437e22b8c2f9f01dec692968754c37eda7775454a73689a *deps-linux-cross-armhf.tar.xz +4a092a90753e06974fcf9c2abec2270b97c64782805ceb91a37da691ecbffc4f *deps-linux-x64.tar.xz +f006645798ea17be1bb246e5a56ff34cb2be3f02a18bf08cff678d791a4870e7 *deps-macos-universal.tar.xz +6fcd23d45d007d736a626261af8d5cf305765a3fe5bf76beea33a20c9191d42d *deps-windows-arm64.7z +c548ee6c8ac5dd96499e175cc8d9c6605f0307ffeeac4b800652e40c8efb4c5a *deps-windows-qt-installer-arm64.7z +6608f997969212c02be5c45e701ae03a798188306581b8f134d18969928ef1fc *deps-windows-qt-installer-x64.7z +e3e5232739f552984740daf4a898c1d07bc462d0e02c22e7909e0fa57613bfed *deps-windows-x64.7z \ No newline at end of file diff --git a/dep/PREBUILT-VERSION b/dep/PREBUILT-VERSION index 75e0f2339..6b8bd0040 100644 --- a/dep/PREBUILT-VERSION +++ b/dep/PREBUILT-VERSION @@ -1 +1 @@ -release-20260805 +release-20260905