Merge pull request #1589 from lioncash/x11

VideoOGL: Move X11 wxWidgets utilities to DolphinWX
This commit is contained in:
Lioncash 2014-11-25 12:41:00 -05:00
commit dcdd4e51f6
7 changed files with 12 additions and 8 deletions

View File

@ -48,6 +48,13 @@ set(GUI_SRCS
WiimoteConfigDiag.cpp
WxUtils.cpp)
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} dl)
list(APPEND LIBS core uicommon)
@ -56,12 +63,9 @@ if(ANDROID)
list(APPEND LIBS png)
endif()
set(ANDROID_SRCS Android/ButtonManager.cpp
MainAndroid.cpp)
set(NOGUI_SRCS MainNoGUI.cpp)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(wxWidgets_FOUND)
list(APPEND WXLIBS

View File

@ -18,7 +18,7 @@
#include "Common/CommonTypes.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"
#endif
class wxBoxSizer;

View File

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

View File

@ -101,7 +101,7 @@ void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
#if HAVE_X11
#include <X11/keysym.h>
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"
class PlatformX11 : public Platform
{

View File

@ -10,7 +10,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h"
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"
extern char **environ;

View File

@ -35,7 +35,7 @@ elseif(USE_X11)
# Make sure to link to it if using GLX.
set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
endif()
set(SRCS ${SRCS} GLInterface/X11_Util.cpp GLInterface/X11Utils.cpp)
set(SRCS ${SRCS} GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif()