From cac53603c52af62372bccb660fb081fb6cdb2e40 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 24 Jan 2017 02:20:40 +0100 Subject: DolphinWX: Put wx related headers before including anything else Including Windows.h before them creates compilation errors. --- Source/Core/DolphinWX/Frame.cpp | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 9bb98c5f62..7bf2f7e1e1 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,12 +10,6 @@ #include #include #include -#if defined(__unix__) || defined(__unix) || defined(__APPLE__) -#include -#endif -#ifdef _WIN32 -#include -#endif #include #include #include @@ -31,6 +25,24 @@ #include #include +#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 +#endif +#ifdef _WIN32 +#include +#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" -- cgit v1.2.3