From 1d1a533eb5a63fc3913f978cac6413f473d9cca3 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Fri, 25 Jul 2025 20:08:40 +0200 Subject: [PATCH] Guard X11 detection to build without X11 deps. --- CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab1e3a0..8a14262 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,8 +309,9 @@ endif() if (CMAKE_SYSTEM_NAME MATCHES "Linux") find_package(SDL2 REQUIRED) - find_package(X11 REQUIRED) - + if (NOT RT64_SDL_WINDOW_VULKAN) + find_package(X11 REQUIRED) + endif() add_compile_definitions("RT64_SDL_WINDOW_VULKAN") # Generate icon_bytes.c from the app icon PNG. @@ -325,13 +326,15 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") target_include_directories(Zelda64Recompiled PRIVATE ${SDL2_INCLUDE_DIRS}) - message(STATUS "X11_FOUND = ${X11_FOUND}") - message(STATUS "X11_Xrandr_FOUND = ${X11_Xrandr_FOUND}") - message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}") - message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") + if (NOT RT64_SDL_WINDOW_VULKAN) + message(STATUS "X11_FOUND = ${X11_FOUND}") + message(STATUS "X11_Xrandr_FOUND = ${X11_Xrandr_FOUND}") + message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}") + message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") - target_include_directories(Zelda64Recompiled PRIVATE ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) - target_link_libraries(Zelda64Recompiled PRIVATE ${X11_LIBRARIES} ${X11_Xrandr_LIB}) + target_include_directories(Zelda64Recompiled PRIVATE ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) + target_link_libraries(Zelda64Recompiled PRIVATE ${X11_LIBRARIES} ${X11_Xrandr_LIB}) + endif() find_package(Freetype REQUIRED)