ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sonicadvance1 2008-08-23 03:48:40 +00:00
parent efd894fe1e
commit 6e3069f99e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/DebuggerWX/src/CodeWindow.cpp
View File

@ -15,6 +15,16 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // 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 "IniFile.h"
#include "Host.h" #include "Host.h"
@ -26,13 +36,6 @@
#include "MemoryWindow.h" #include "MemoryWindow.h"
#include "JitWindow.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 "CodeWindow.h"
#include "CodeView.h" #include "CodeView.h"
@ -46,9 +49,6 @@
#include "PowerPC/Jit64/Jit.h" #include "PowerPC/Jit64/Jit.h"
#include "PowerPC/Jit64/JitCache.h" #include "PowerPC/Jit64/JitCache.h"
// ugly that this lib included code from the main
#include "../../DolphinWX/src/Globals.h"
extern "C" { extern "C" {
#include "../resources/toolbar_play.c" #include "../resources/toolbar_play.c"
#include "../resources/toolbar_pause.c" #include "../resources/toolbar_pause.c"
@ -747,4 +747,4 @@ void CCodeWindow::SingleCPUStep()
codeview->Center(PC); codeview->Center(PC);
Update(); Update();
Host_UpdateLogDisplay(); Host_UpdateLogDisplay();
} }

2
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -63,7 +63,7 @@ BOOL Callback_PeekMessages()
void UpdateFPSDisplay(const char *text) void UpdateFPSDisplay(const char *text)
{ {
char temp[512]; 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); SetWindowText( EmuWindow::GetWnd(), temp);
} }

2
Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
View File

@ -103,7 +103,7 @@ void UpdateFPSDisplay(const char *text)
OpenGL_SetWindowText(temp); OpenGL_SetWindowText(temp);
#else #else
char temp[512]; 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); OpenGL_SetWindowText(temp);
#endif #endif
} }