RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Qt 6.6.1

Browse Source
This commit is contained in:
Megamouse 2023-11-24 23:36:04 +01:00
parent 4dfda3240c
commit 826cdbb507
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -7,7 +7,7 @@ env:
BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH
RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!] RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!]
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
QT_VER: '6.6.0' QT_VER: '6.6.1'
# windows_task: # windows_task:
# matrix: # matrix:
@ -21,7 +21,7 @@ env:
# COMPILER: msvc # COMPILER: msvc
# BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
# QT_VER_MSVC: 'msvc2019' # QT_VER_MSVC: 'msvc2019'
# QT_DATE: '202310040911' # QT_DATE: '202311210527'
# QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
# VULKAN_VER: '1.3.224.1' # VULKAN_VER: '1.3.224.1'
# VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' # VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
@ -56,7 +56,7 @@ env:
# linux_task: # linux_task:
# container: # container:
# image: rpcs3/rpcs3-ci-focal:1.3 # image: rpcs3/rpcs3-ci-focal:1.4
# cpu: 4 # cpu: 4
# memory: 16G # memory: 16G
# env: # env:

2
3rdparty/qt6.cmake vendored
View File

@ -1,6 +1,6 @@
add_library(3rdparty_qt6 INTERFACE) add_library(3rdparty_qt6 INTERFACE)
set(QT_MIN_VER 6.2.4) set(QT_MIN_VER 6.4.0)
find_package(Qt6 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent Multimedia MultimediaWidgets Svg SvgWidgets) find_package(Qt6 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent Multimedia MultimediaWidgets Svg SvgWidgets)
if(WIN32) if(WIN32)

8
BUILDING.md
View File

@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu
* [CMake 3.16.9+](https://www.cmake.org/download/) (add to PATH) * [CMake 3.16.9+](https://www.cmake.org/download/) (add to PATH)
* [Python 3.6+](https://www.python.org/downloads/) (add to PATH) * [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
* [Qt 6.6.0](https://www.qt.io/download-qt-installer) * [Qt 6.6.1](https://www.qt.io/download-qt-installer)
* [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) * [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
* [Vulkan SDK 1.3.224](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.224. * [Vulkan SDK 1.3.224](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.224.
**Either add the** `QTDIR` **environment variable, e.g.** `<QtInstallFolder>\6.6.0\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** **Either add the** `QTDIR` **environment variable, e.g.** `<QtInstallFolder>\6.6.1\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)**
### Linux ### Linux
@ -21,7 +21,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst
* Clang 12+ or GCC 11+ * Clang 12+ or GCC 11+
* [CMake 3.16.9+](https://www.cmake.org/download/) * [CMake 3.16.9+](https://www.cmake.org/download/)
* [Qt 6.6.0](https://www.qt.io/download-qt-installer) * [Qt 6.6.1](https://www.qt.io/download-qt-installer)
* [Vulkan SDK 1.3.224](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.224. * [Vulkan SDK 1.3.224](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.224.
* [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
@ -96,7 +96,7 @@ git submodule update --init
#### Configuring the Qt plugin (if used) #### Configuring the Qt plugin (if used)
1) Go to `Extensions->Qt VS Tools->Qt Versions`. 1) Go to `Extensions->Qt VS Tools->Qt Versions`.
2) Add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.6.0\msvc2019_64`, version will fill in automatically. 2) Add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.6.1\msvc2019_64`, version will fill in automatically.
3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. 3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`.
4) Set `Build: Run pre-build setup` to `true`. 4) Set `Build: Run pre-build setup` to `true`.

10
azure-pipelines.yml
View File

@ -38,13 +38,13 @@ jobs:
displayName: ccache displayName: ccache
- bash: | - bash: |
docker pull --quiet rpcs3/rpcs3-ci-focal:1.3 docker pull --quiet rpcs3/rpcs3-ci-focal:1.4
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/docker.env \ --env-file .ci/docker.env \
-v $CCACHE_DIR:/root/.ccache \ -v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-ci-focal:1.3 \ rpcs3/rpcs3-ci-focal:1.4 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build
@ -69,9 +69,9 @@ jobs:
variables: variables:
COMPILER: msvc COMPILER: msvc
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
QT_VER: '6.6.0' QT_VER: '6.6.1'
QT_VER_MSVC: 'msvc2019' QT_VER_MSVC: 'msvc2019'
QT_DATE: '202310040911' QT_DATE: '202311210527'
QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
VULKAN_VER: '1.3.224.1' VULKAN_VER: '1.3.224.1'
VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
@ -132,7 +132,7 @@ jobs:
UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac"
RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
ARTDIR: $(Build.ArtifactStagingDirectory) ARTDIR: $(Build.ArtifactStagingDirectory)
QT_VER: '6.6.0' QT_VER: '6.6.1'
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
pool: pool: