Moved X11Utils into UICommon.

This commit is contained in:
Vlad Firoiu 2016-05-05 19:43:38 -04:00
parent 7cc5604a2c
commit 6a89cf0201
8 changed files with 9 additions and 10 deletions

View File

@ -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")

View File

@ -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{{

View File

@ -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)

View File

@ -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

View File

@ -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
{

View File

@ -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})

View File

@ -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>