From 19b314e01807751a6502951b415beada2c084040 Mon Sep 17 00:00:00 2001 From: DH Date: Sat, 4 Oct 2025 17:14:58 +0300 Subject: [PATCH] VulkanLoader: enable x11 and xcb if available only --- .github/workflows/rpcsx.yml | 2 +- 3rdparty/CMakeLists.txt | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rpcsx.yml b/.github/workflows/rpcsx.yml index 86216eefc..40f333107 100644 --- a/.github/workflows/rpcsx.yml +++ b/.github/workflows/rpcsx.yml @@ -23,7 +23,7 @@ jobs: run: | sudo apt update 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 --build build -j$(($(nproc) + 2)) sudo cmake --build build diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 981498b9a..67174c58e 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -279,7 +279,17 @@ if (NOT COMPILE_VULKAN_LOADER OR ANDROID OR APPLE) endif() 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) target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Loader)