From 0495f3f542fea76658f514f2cdb954e002ad4690 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Thu, 24 Jul 2025 18:24:54 +0200 Subject: [PATCH] Add build time option to build for pure Wayland on GNU/Linux. --- librecomp/CMakeLists.txt | 4 ++++ ultramodern/CMakeLists.txt | 4 ++++ ultramodern/include/ultramodern/renderer_context.hpp | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/librecomp/CMakeLists.txt b/librecomp/CMakeLists.txt index 9c4bf53..c587661 100644 --- a/librecomp/CMakeLists.txt +++ b/librecomp/CMakeLists.txt @@ -56,6 +56,10 @@ if (WIN32) add_compile_definitions(NOMINMAX) endif() +if (LINUX_USE_WAYLAND) + target_compile_definitions(librecomp PRIVATE LINUX_USE_WAYLAND) +endif() + add_subdirectory(${PROJECT_SOURCE_DIR}/../thirdparty/miniz ${CMAKE_CURRENT_BINARY_DIR}/miniz) add_subdirectory(${PROJECT_SOURCE_DIR}/../N64Recomp ${CMAKE_CURRENT_BINARY_DIR}/N64Recomp EXCLUDE_FROM_ALL) diff --git a/ultramodern/CMakeLists.txt b/ultramodern/CMakeLists.txt index 90ac35a..287d0ad 100644 --- a/ultramodern/CMakeLists.txt +++ b/ultramodern/CMakeLists.txt @@ -38,3 +38,7 @@ target_compile_options(ultramodern PRIVATE if (WIN32) add_compile_definitions(NOMINMAX) endif() + +if (LINUX_USE_WAYLAND) + target_compile_definitions(ultramodern PRIVATE LINUX_USE_WAYLAND) +endif() diff --git a/ultramodern/include/ultramodern/renderer_context.hpp b/ultramodern/include/ultramodern/renderer_context.hpp index 67ae544..793ed46 100644 --- a/ultramodern/include/ultramodern/renderer_context.hpp +++ b/ultramodern/include/ultramodern/renderer_context.hpp @@ -12,7 +12,9 @@ #elif defined(__ANDROID__) # include "android/native_window.h" #elif defined(__linux__) -# include "X11/Xlib.h" +# if !defined(LINUX_USE_WAYLAND) +# include "X11/Xlib.h" +# endif # undef None # undef Status # undef LockMask