diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index c03363823..09e84e3ea 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(common STATIC ExitCodes.h I18N.h I18N.cpp + PlatformInfo.h Settings.h Settings.cpp QSettingsProxy.cpp diff --git a/src/lib/platform/Wayland.h b/src/lib/common/PlatformInfo.h similarity index 100% rename from src/lib/platform/Wayland.h rename to src/lib/common/PlatformInfo.h diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index a41effec3..a24115276 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -13,6 +13,7 @@ #include "base/Log.h" #include "client/Client.h" #include "common/ExitCodes.h" +#include "common/PlatformInfo.h" #include "common/Settings.h" #include "deskflow/Screen.h" #include "deskflow/ScreenException.h" @@ -20,7 +21,6 @@ #include "net/SocketException.h" #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" -#include "platform/Wayland.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" @@ -47,10 +47,6 @@ #include "platform/OSXScreen.h" #endif -#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI) -#include "platform/Wayland.h" -#endif - #include constexpr static auto s_retryTime = 1.0; diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index d504ff817..671aa503e 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -13,6 +13,7 @@ #include "base/Log.h" #include "base/Path.h" #include "common/ExitCodes.h" +#include "common/PlatformInfo.h" #include "common/Settings.h" #include "deskflow/App.h" #include "deskflow/Screen.h" @@ -52,10 +53,6 @@ #include "platform/OSXScreen.h" #endif -#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI) -#include "platform/Wayland.h" -#endif - #include using namespace deskflow::server; diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 1e26c6f80..3dc010451 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -19,6 +19,7 @@ #include "dialogs/SettingsDialog.h" #include "base/String.h" +#include "common/PlatformInfo.h" #include "common/Settings.h" #include "common/UrlConstants.h" #include "gui/Messages.h" @@ -27,7 +28,6 @@ #include "gui/ipc/DaemonIpcClient.h" #include "gui/widgets/LogDock.h" #include "net/FingerprintDatabase.h" -#include "platform/Wayland.h" #if defined(Q_OS_LINUX) #include "Config.h" diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 39cf1e4fa..88451c2c7 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -152,7 +152,7 @@ endif() include_directories(${inc}) # wayland.h is included to check for wayland support -add_library(platform STATIC ${PLATFORM_SOURCES} Wayland.h) +add_library(platform STATIC ${PLATFORM_SOURCES}) target_link_libraries(platform client ${libs}) diff --git a/src/lib/platform/XDGPortalRegistry.h b/src/lib/platform/XDGPortalRegistry.h index de5335317..8bc94a69f 100644 --- a/src/lib/platform/XDGPortalRegistry.h +++ b/src/lib/platform/XDGPortalRegistry.h @@ -11,7 +11,7 @@ #include #include "common/Constants.h" -#include "platform/Wayland.h" +#include "common/PlatformInfo.h" namespace deskflow::platform {