Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-12 04:35:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into shader_cache

Browse source
This commit is contained in:
Fire Cube 2025-06-26 08:19:51 +02:00
commit a4ae1dea06
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CMakePresets.json
View file

@ -25,18 +25,9 @@
{ {
"name": "x64-Clang-Debug", "name": "x64-Clang-Debug",
"displayName": "Clang x64 Debug", "displayName": "Clang x64 Debug",
"generator": "Ninja", "inherits": ["x64-Clang-Base"],
"binaryDir": "${sourceDir}/Build/x64-Clang-Debug",
"cacheVariables": { "cacheVariables": {
"CMAKE_C_COMPILER": "clang-cl", "CMAKE_BUILD_TYPE": "Debug"
"CMAKE_CXX_COMPILER": "clang-cl",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/Install/x64-Clang-Debug"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"intelliSenseMode": "windows-clang-x64"
}
} }
}, },
{ {

4
cmake/DetectQtInstallation.cmake
View file

@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project # SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
file(GLOB QT_KITS LIST_DIRECTORIES true "C:/Qt/*/msvc*") file(GLOB QT_KITS LIST_DIRECTORIES true "C:/Qt/*/msvc*_64")
list(SORT QT_KITS COMPARE NATURAL) list(SORT QT_KITS COMPARE NATURAL)
list(REVERSE QT_KITS) list(REVERSE QT_KITS)
if(QT_KITS) if(QT_KITS)
@ -9,6 +9,6 @@ if(QT_KITS)
set(CMAKE_PREFIX_PATH "${QT_PREFIX}" CACHE PATH "Qt prefix auto‑detected" FORCE) set(CMAKE_PREFIX_PATH "${QT_PREFIX}" CACHE PATH "Qt prefix auto‑detected" FORCE)
message(STATUS "Auto-detected Qt prefix: ${QT_PREFIX}") message(STATUS "Auto-detected Qt prefix: ${QT_PREFIX}")
else() else()
message(WARNING "findQt.cmake: no Qt‑Directory found in C:/Qt – please set CMAKE_PREFIX_PATH manually") message(STATUS "findQt.cmake: no Qt‑Directory found in C:/Qt – please set CMAKE_PREFIX_PATH manually")
endif() endif()