Prechádzať zdrojové kódy

chore: update readme
chore: some X11 files were being included in wayland-only builds

Alexis Maiquez 1 rok pred
rodič
commit
1c12951a6a

+ 1 - 2
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

+ 3 - 3
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

+ 5 - 1
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 <unistd.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION