Should fix Linux building, also adds GL/DX to the title in their respective plugins when in use

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@275 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 11 insertions, 11 deletions

diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp
index 79b66300eb..d0c270ad48 100644
--- a/Source/Core/DebuggerWX/src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp
@@ -15,6 +15,16 @@
 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

 

+#include "wx/button.h"

+#include "wx/textctrl.h"

+#include "wx/listctrl.h"

+#include "wx/thread.h"

+#include "wx/listctrl.h"

+#include "wx/mstream.h"

+

+// ugly that this lib included code from the main

+#include "../../DolphinWX/src/Globals.h"

+

 #include "IniFile.h"

 #include "Host.h"

 

@@ -26,13 +36,6 @@
 #include "MemoryWindow.h"

 #include "JitWindow.h"

 

-#include "wx/button.h"

-#include "wx/textctrl.h"

-#include "wx/listctrl.h"

-#include "wx/thread.h"

-#include "wx/listctrl.h"

-#include "wx/mstream.h"

-

 #include "CodeWindow.h"

 #include "CodeView.h"

 

@@ -46,9 +49,6 @@
 #include "PowerPC/Jit64/Jit.h"

 #include "PowerPC/Jit64/JitCache.h"

 

-// ugly that this lib included code from the main

-#include "../../DolphinWX/src/Globals.h"

-

 extern "C" {

 	#include "../resources/toolbar_play.c"

 	#include "../resources/toolbar_pause.c"

@@ -747,4 +747,4 @@ void CCodeWindow::SingleCPUStep()
 	codeview->Center(PC);

 	Update();

 	Host_UpdateLogDisplay();

-}
\ No newline at end of file
+}