diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-01-24 14:35:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 14:35:05 +0100 |
| commit | 63f56ccd023af0ffeb7bac64e9c91b86760d5aa3 (patch) | |
| tree | 91e66333eb3c2bdf50b37f06199b9901cd6c9110 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 221be63cb4b8615f3b889807cefb0d84a8211d61 (diff) | |
| parent | 803ea7b14365c05b437dfb616c7c4cc1b891ba16 (diff) | |
Merge pull request #4741 from Orphis/cmake_cleanup
CMake cleanup
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 9bb98c5f62..817933cd63 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,12 +10,6 @@ #include <string> #include <utility> #include <vector> -#if defined(__unix__) || defined(__unix) || defined(__APPLE__) -#include <signal.h> -#endif -#ifdef _WIN32 -#include <windows.h> -#endif #include <wx/aui/auibook.h> #include <wx/aui/framemanager.h> #include <wx/filename.h> @@ -31,6 +25,24 @@ #include <wx/thread.h> #include <wx/toolbar.h> +#include "DolphinWX/Config/ConfigMain.h" +#include "DolphinWX/Debugger/BreakpointDlg.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/MemoryCheckDlg.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/Main.h" +#include "DolphinWX/TASInputDlg.h" +#include "DolphinWX/WxUtils.h" + +#if defined(__unix__) || defined(__unix) || defined(__APPLE__) +#include <signal.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif + #include "AudioCommon/AudioCommon.h" #include "Common/CommonTypes.h" @@ -51,17 +63,6 @@ #include "Core/Movie.h" #include "Core/State.h" -#include "DolphinWX/Config/ConfigMain.h" -#include "DolphinWX/Debugger/BreakpointDlg.h" -#include "DolphinWX/Debugger/CodeWindow.h" -#include "DolphinWX/Debugger/MemoryCheckDlg.h" -#include "DolphinWX/GameListCtrl.h" -#include "DolphinWX/Globals.h" -#include "DolphinWX/LogWindow.h" -#include "DolphinWX/Main.h" -#include "DolphinWX/TASInputDlg.h" -#include "DolphinWX/WxUtils.h" - #include "InputCommon/GCPadStatus.h" #include "VideoCommon/OnScreenDisplay.h" @@ -70,6 +71,10 @@ #include "VideoCommon/VideoConfig.h" #if defined(HAVE_X11) && HAVE_X11 + +#include <gdk/gdkx.h> +#include <gtk/gtk.h> + // X11Utils nastiness that's only used here namespace X11Utils { |