RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

VulkanLoader: enable x11 and xcb if available only

Browse source
This commit is contained in:
DH 2025-10-04 17:14:58 +03:00
parent 24ad8607fa
commit 19b314e018
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ jobs:
run: | run: |
sudo apt update sudo apt update
sudo apt install -y cmake build-essential libunwind-dev \ sudo apt install -y cmake build-essential libunwind-dev \
libsox-dev g++-14 ninja-build libasound2-dev nasm libudev-dev libsox-dev g++-14 ninja-build libasound2-dev nasm libudev-dev libxcb-dev libx11-dev
cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr
cmake --build build -j$(($(nproc) + 2)) cmake --build build -j$(($(nproc) + 2))
sudo cmake --build build sudo cmake --build build

12
3rdparty/CMakeLists.txt vendored
View file

@ -279,7 +279,17 @@ if (NOT COMPILE_VULKAN_LOADER OR ANDROID OR APPLE)
endif() endif()
if (COMPILE_VULKAN_LOADER) if (COMPILE_VULKAN_LOADER)
set(BUILD_WSI_XCB_SUPPORT off) find_package(xcb)
if (NOT xcb_FOUND)
message(WARNING "Compiling Vulkan-Loader without XCB support")
set(BUILD_WSI_XCB_SUPPORT off)
endif()
find_package(x11)
if (NOT x11_FOUND)
message(WARNING "Compiling Vulkan-Loader without X11 support")
set(BUILD_WSI_XLIB_SUPPORT off)
endif()
add_subdirectory(Vulkan-Loader) add_subdirectory(Vulkan-Loader)
target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Loader) target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Loader)