From 1c12951a6a930a128dd843ab83d465545644b61c Mon Sep 17 00:00:00 2001 From: Alexis Maiquez Date: Sat, 12 Oct 2024 20:59:51 +0200 Subject: [PATCH] chore: update readme chore: some X11 files were being included in wayland-only builds --- CMakeLists.txt | 3 +-- README.md | 6 +++--- src/WallpaperEngine/Application/CWallpaperApplication.cpp | 6 +++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59d4a5e..ab442e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,6 @@ add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper) include_directories( ${MPV_INCLUDE_DIR} - ${XRANDR_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${LZ4_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS} @@ -171,7 +170,7 @@ if(X11_FOUND) endif() if(X11_SUPPORT_FOUND) - include_directories(${X11_INCLUDE_DIR}) + include_directories(${X11_INCLUDE_DIR} ${XRANDR_INCLUDE_DIR}) add_compile_definitions(ENABLE_X11) set(X11_SOURCES diff --git a/README.md b/README.md index b0eaf11..1487e1a 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ Wallpaper Engine is a software designed by [Kristjan Skutta](https://store.steam # 4. Compilation requirements ## linux-wallpaperengine -- OpenGL 2.1 support +- OpenGL 3.3 support - CMake - LZ4 - ZLIB -- SDL +- SDL2 - FFmpeg -- X11 (with libxxf86vm) +- X11 (with libxxf86vm) or Wayland - Xrandr - GLFW3 - GLM diff --git a/src/WallpaperEngine/Application/CWallpaperApplication.cpp b/src/WallpaperEngine/Application/CWallpaperApplication.cpp index 3c01988..2fd715e 100644 --- a/src/WallpaperEngine/Application/CWallpaperApplication.cpp +++ b/src/WallpaperEngine/Application/CWallpaperApplication.cpp @@ -6,14 +6,18 @@ #include "WallpaperEngine/Assets/CDirectory.h" #include "WallpaperEngine/Assets/CVirtualContainer.h" #include "WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h" -#include "WallpaperEngine/Core/Wallpapers/CVideo.h" #include "WallpaperEngine/Input/Drivers/CGLFWMouseInput.h" #include "WallpaperEngine/Logging/CLog.h" #include "WallpaperEngine/Render/CRenderContext.h" +#ifdef ENABLE_WAYLAND #include "WallpaperEngine/Input/Drivers/CWaylandMouseInput.h" #include "WallpaperEngine/Render/Drivers/CWaylandOpenGLDriver.h" +#endif /* ENABLE_WAYLAND */ + +#ifdef ENABLE_X11 #include "WallpaperEngine/Render/Drivers/Detectors/CX11FullScreenDetector.h" +#endif /* ENABLE_X11 */ #include #define STB_IMAGE_WRITE_IMPLEMENTATION