Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge b878f70ea6 into 2afd7707fe

Browse source
This commit is contained in:
Megamouse 2025-04-27 07:42:25 -07:00 • committed by GitHub
commit 7c844acb2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -8,8 +8,8 @@ env:
RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1] RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
QT_VER: '6.9.0' QT_VER: '6.9.0'
LLVM_COMPILER_VER: '19' LLVM_COMPILER_VER: '20'
LLVM_VER: '19.1.7' LLVM_VER: '20.1.3'
# windows_task: # windows_task:
# matrix: # matrix:

2
.github/workflows/rpcs3.yml vendored
View file

@ -108,7 +108,7 @@ jobs:
QT_VER: '6.9.0' QT_VER: '6.9.0'
QT_VER_MSVC: 'msvc2022' QT_VER_MSVC: 'msvc2022'
QT_DATE: '202503301022' QT_DATE: '202503301022'
LLVM_VER: '19.1.7' LLVM_VER: '20.1.3'
VULKAN_VER: '1.3.268.0' VULKAN_VER: '1.3.268.0'
VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c' CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'

2
3rdparty/llvm/CMakeLists.txt vendored
View file

@ -51,7 +51,7 @@ if(WITH_LLVM)
set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE) set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)
find_package(LLVM 19.1 CONFIG) find_package(LLVM 20.1 CONFIG)
if(NOT LLVM_FOUND) if(NOT LLVM_FOUND)
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`") message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
endif() endif()

2
3rdparty/llvm/llvm vendored

@ -1 +1 @@
Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90 Subproject commit 923a5c4f83d2b3675bb88e9fe441daeaa4d69488

2
BUILDING.md
View file

@ -130,7 +130,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
**NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`) **NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs: To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs:
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z) - [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-20.1.3/llvmlibs_mt.7z)
- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z) - [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)
**NOTES:** **NOTES:**

6
azure-pipelines.yml
View file

@ -75,7 +75,7 @@ jobs:
# QT_VER_MSVC: 'msvc2022' # QT_VER_MSVC: 'msvc2022'
# QT_DATE: '202503301022' # QT_DATE: '202503301022'
# QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 # QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
# LLVM_VER: '19.1.7' # LLVM_VER: '20.1.3'
# VULKAN_VER: '1.3.268.0' # VULKAN_VER: '1.3.268.0'
# VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
# VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) # VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
@ -149,7 +149,7 @@ jobs:
ARTDIR: $(Build.ArtifactStagingDirectory) ARTDIR: $(Build.ArtifactStagingDirectory)
QT_VER: '6.7.3' QT_VER: '6.7.3'
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
LLVM_COMPILER_VER: '19' LLVM_COMPILER_VER: '20'
pool: pool:
vmImage: "macOS-14" vmImage: "macOS-14"
@ -210,7 +210,7 @@ jobs:
ARTDIR: $(Build.ArtifactStagingDirectory) ARTDIR: $(Build.ArtifactStagingDirectory)
QT_VER: '6.7.3' QT_VER: '6.7.3'
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
LLVM_COMPILER_VER: '19' LLVM_COMPILER_VER: '20'
pool: pool:
vmImage: "macOS-14" vmImage: "macOS-14"

4
buildfiles/msvc/rpcs3_default.props
View file

@ -41,8 +41,8 @@
LLVMBitstreamReader.lib; LLVMBitstreamReader.lib;
LLVMBitWriter.lib; LLVMBitWriter.lib;
LLVMCFGuard.lib; LLVMCFGuard.lib;
LLVMCGData.lib;
LLVMCodeGen.lib; LLVMCodeGen.lib;
LLVMCodeGenData.lib;
LLVMCodeGenTypes.lib; LLVMCodeGenTypes.lib;
LLVMCore.lib; LLVMCore.lib;
LLVMCoroutines.lib; LLVMCoroutines.lib;
@ -64,6 +64,7 @@
LLVMExecutionEngine.lib; LLVMExecutionEngine.lib;
LLVMExtensions.lib; LLVMExtensions.lib;
LLVMFileCheck.lib; LLVMFileCheck.lib;
LLVMFrontendAtomic.lib;
LLVMFrontendDriver.lib; LLVMFrontendDriver.lib;
LLVMFrontendHLSL.lib; LLVMFrontendHLSL.lib;
LLVMFrontendOffloading.lib; LLVMFrontendOffloading.lib;
@ -116,6 +117,7 @@
LLVMTableGenCommon.lib; LLVMTableGenCommon.lib;
LLVMTarget.lib; LLVMTarget.lib;
LLVMTargetParser.lib; LLVMTargetParser.lib;
LLVMTelemetry.lib;
LLVMTextAPI.lib; LLVMTextAPI.lib;
LLVMTextAPIBinaryReader.lib; LLVMTextAPIBinaryReader.lib;
LLVMTransformUtils.lib; LLVMTransformUtils.lib;