diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index 2564ae3955..cefe10261f 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -11,9 +11,9 @@ PR_NUMBER="$SYSTEM_PULLREQUEST_PULLREQUESTID" QT_HOST="http://qt.mirror.constant.com/" QT_URL_VER=$(echo "$QT_VER" | sed "s/\.//g") QT_VER_MSVC_UP=$(echo "${QT_VER_MSVC}" | tr '[:lower:]' '[:upper:]') -QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}." +QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}." QT_PREFIX_2="win64_${QT_VER_MSVC}_64/${QT_VER}-0-${QT_DATE}" -QT_SUFFIX="-Windows-Windows_10_22H2-${QT_VER_MSVC_UP}-Windows-Windows_10_22H2-X86_64.7z" +QT_SUFFIX="-Windows-Windows_11_23H2-${QT_VER_MSVC_UP}-Windows-Windows_11_23H2-X86_64.7z" QT_BASE_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtbase${QT_SUFFIX}" QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}" QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}" diff --git a/.cirrus.yml b/.cirrus.yml index 4dce31a4e9..c9e17f24f6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1] QT_VER_MAIN: '6' - QT_VER: '6.7.3' + QT_VER: '6.8.0' # windows_task: # matrix: @@ -20,8 +20,8 @@ env: # CIRRUS_SHELL: "bash" # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ -# QT_VER_MSVC: 'msvc2019' -# QT_DATE: '202409200836' +# QT_VER_MSVC: 'msvc2022' +# QT_DATE: '202410030750' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' @@ -56,7 +56,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-focal:1.7 +# image: rpcs3/rpcs3-ci-focal:1.9 # cpu: 4 # memory: 16G # env: diff --git a/BUILDING.md b/BUILDING.md index 9133596547..ee633b134c 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -19,26 +19,26 @@ The following tools are required to build RPCS3 on Windows 10 or later: with standalone **CMake** tool. - [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -- [Qt 6.7.3](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt) +- [Qt 6.8.0](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt) - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (see "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. The `sln` solution available only on **Visual Studio** is the preferred building solution. It easily allows to build the **RPCS3** application in `Release` and `Debug` mode. In order to build **RPCS3** with the `sln` solution (with **Visual Studio**), **Qt** libs need to be detected. To detect the libs: -- add and set the `QTDIR` environment variable, e.g. `\6.7.3\msvc2019_64\` +- add and set the `QTDIR` environment variable, e.g. `\6.8.0\msvc2019_64\` - or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019) **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2019) instead. In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool): -- add and set the `CMAKE_PREFIX_PATH` environment variable to the **Qt** libs path, e.g. `\6.7.3\msvc2019_64\` +- add and set the `CMAKE_PREFIX_PATH` environment variable to the **Qt** libs path, e.g. `\6.8.0\msvc2019_64\` ### Linux These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager: - Clang 17+ or GCC 13+ - [CMake 3.28.0+](https://www.cmake.org/download/) -- [Qt 6.7.3](https://www.qt.io/download-qt-installer) +- [Qt 6.8.0](https://www.qt.io/download-qt-installer) - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. - [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -119,7 +119,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r ##### Configuring the Qt Plugin (if used) 1) go to `Extensions->Qt VS Tools->Qt Versions` -2) add the path to your Qt installation with compiler e.g. `\6.7.3\msvc2019_64`, version will fill in automatically +2) add the path to your Qt installation with compiler e.g. `\6.8.0\msvc2019_64`, version will fill in automatically 3) go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the **Legacy Qt Plugin**) 4) set `Build: Run pre-build setup` to `true`. (Only available in the **Legacy Qt Plugin**) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c6c8f36b5..4c7055a676 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,9 +69,9 @@ jobs: variables: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.7.3' - QT_VER_MSVC: 'msvc2019' - QT_DATE: '202409200836' + QT_VER: '6.8.0' + QT_VER_MSVC: 'msvc2022' + QT_DATE: '202410030750' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' @@ -132,7 +132,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.7.3' + QT_VER: '6.8.0' QT_VER_MAIN: '6' LLVM_COMPILER_VER: '16' @@ -193,7 +193,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac-arm64" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.7.3' + QT_VER: '6.8.0' QT_VER_MAIN: '6' LLVM_COMPILER_VER: '16'