Merge pull request #1589 from lioncash/x11

VideoOGL: Move X11 wxWidgets utilities to DolphinWX

7 files changed, 12 insertions, 8 deletions

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 7d70e0692b..3f20e400bf 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -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
diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h
index 23cd4714f0..bf447b0ace 100644
--- a/Source/Core/DolphinWX/ConfigMain.h
+++ b/Source/Core/DolphinWX/ConfigMain.h
@@ -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;
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index 91486f53cc..29b3eeb21d 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -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
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index 0b8f4b1099..c723bac087 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -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
 {
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/X11Utils.cpp b/Source/Core/DolphinWX/X11Utils.cpp
index 7832269e27..6a666692a2 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/X11Utils.cpp
+++ b/Source/Core/DolphinWX/X11Utils.cpp
@@ -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;
 
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h
index b68a1babe6..b68a1babe6 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/X11Utils.h
+++ b/Source/Core/DolphinWX/X11Utils.h
diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
index 03bbdb9b9c..6d972e538c 100644
--- a/Source/Core/VideoBackends/OGL/CMakeLists.txt
+++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -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()