Moved X11Utils into UICommon.

Source/Core/DolphinWX/CMakeLists.txt

@@ -81,11 +81,6 @@ set(GUI_SRCS
 
 set(NOGUI_SRCS MainNoGUI.cpp)
 
-if(USE_X11)
-  set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)
-  set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
-endif()
-
 set(WXLIBS ${wxWidgets_LIBRARIES})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp

@@ -30,7 +30,7 @@
 #include "DolphinWX/WxUtils.h"
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 static const std::array<std::string, 29> language_ids{{

Source/Core/DolphinWX/ControllerConfigDiag.cpp

@@ -41,7 +41,7 @@
 #include "InputCommon/GCAdapter.h"
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)

Source/Core/DolphinWX/Frame.h

@@ -21,7 +21,7 @@
 #include "InputCommon/GCPadStatus.h"
 
 #if defined(HAVE_X11) && HAVE_X11
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 // Class declarations

Source/Core/DolphinWX/MainNoGUI.cpp

@@ -168,7 +168,7 @@ void Host_YieldToUI()
 
 #if HAVE_X11
 #include <X11/keysym.h>
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 
 class PlatformX11 : public Platform
 {

Source/Core/UICommon/CMakeLists.txt

@@ -5,6 +5,10 @@ set(SRCS
   USBUtils.cpp
 )
 
+if(USE_X11)
+  set(SRCS ${SRCS} X11Utils.cpp)
+endif()
+
 set(LIBS common cpp-optparse)
 if(LIBUSB_FOUND)
   set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})

Source/Core/UICommon/X11Utils.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 
 #include <algorithm>
 #include <cstdio>