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 +} diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 63ec234e5c..7461bc0d46 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -63,7 +63,7 @@ BOOL Callback_PeekMessages() void UpdateFPSDisplay(const char *text) { char temp[512]; - sprintf_s(temp, 512, "SVN R%i: %s", SVN_REV, text); + sprintf_s(temp, 512, "SVN R%i: DX9: %s", SVN_REV, text); SetWindowText( EmuWindow::GetWnd(), temp); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp index bb6bb27eb7..e2e4a21c03 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp @@ -103,7 +103,7 @@ void UpdateFPSDisplay(const char *text) OpenGL_SetWindowText(temp); #else char temp[512]; - sprintf(temp, "SVN %s: %s", "Linux", text); //TODO: Set to svn rev // + sprintf(temp, "SVN %s: GL: %s", "Linux", text); //TODO: Set to svn rev // OpenGL_SetWindowText(temp); #endif }