From 422437824c9e88afdc38984be5c102417557d5a1 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sat, 20 Dec 2008 19:40:20 +0000 Subject: [PATCH] compile fixes git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1613 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Core/Src/Debugger/Debugger_BreakPoints.cpp | 4 ++-- Source/Core/Core/Src/HW/Memmap.cpp | 16 ++++++++-------- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/DolphinWX/Src/MemcardManager.cpp | 8 ++++---- Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h | 10 +++++----- Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h | 1 + Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp | 9 +++++---- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp b/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp index ecf969c7b5..35df949e6a 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp +++ b/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp @@ -117,11 +117,11 @@ void BreakPoints::AddAutoBreakpoints() "PPCHalt", }; - for (int i = 0; i < sizeof(bps) / sizeof(const char *); i++) + for (u32 i = 0; i < sizeof(bps) / sizeof(const char *); i++) { Symbol *symbol = g_symbolDB.GetSymbolFromName(bps[i]); if (symbol) - AddBreakPoint(symbol->address, false); + BreakPoints::Add(symbol->address, false); } #endif #endif diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index bda446bb58..a59fa816e1 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -783,7 +783,7 @@ u8 Read_U8(const u32 _Address) u8 _var = (u8)0xAFFEAFFE; ReadFromHardware2(_var, 8, _Address, _Address, FLAG_READ); #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -798,7 +798,7 @@ u16 Read_U16(const u32 _Address) u16 _var = 0; ReadFromHardware2(_var, 16, _Address, _Address, FLAG_READ); #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -821,7 +821,7 @@ u32 Read_U32(const u32 _Address) u32 _var = 0; ReadFromHardware2(_var, 32, _Address, _Address, FLAG_READ); #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -837,7 +837,7 @@ u64 Read_U64(const u32 _Address) u64 _var = 0; ReadFromHardware2(_var, 64, _Address, _Address, FLAG_READ); #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -851,7 +851,7 @@ u64 Read_U64(const u32 _Address) void Write_U8(const u8 _Data, const u32 _Address) { #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -865,7 +865,7 @@ void Write_U8(const u8 _Data, const u32 _Address) void Write_U16(const u16 _Data, const u32 _Address) { #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -880,7 +880,7 @@ void Write_U16(const u16 _Data, const u32 _Address) void Write_U32(const u32 _Data, const u32 _Address) { #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; @@ -900,7 +900,7 @@ void WriteHW_U32(const u32 _Data, const u32 _Address) void Write_U64(const u64 _Data, const u32 _Address) { #ifndef NOCHECK - TMemCheck *mc = CBreakPoints::GetMemCheck(_Address); + TMemCheck *mc = MemChecks::GetMemCheck(_Address); if (mc) { mc->numHits++; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index dba7e30403..4c78609ce8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -25,7 +25,7 @@ #include "../../Core.h" #include "../../PatchEngine.h" #include "../../CoreTiming.h" -#include "../../Debugger/Debugger_Breakpoints.h" +#include "../../Debugger/Debugger_BreakPoints.h" #include "../PowerPC.h" #include "../Profiler.h" #include "../PPCTables.h" diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 4112d9e5c3..12659a3708 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -282,7 +282,7 @@ void CMemcardManager::CreateGUIControls() m_Delete[i]->Disable(); if (strcasecmp(DefaultMemcard[i].c_str(), ".")) { - m_MemcardPath[i]->SetPath(wxT(DefaultMemcard[i])); + m_MemcardPath[i]->SetPath(wxString::FromAscii(DefaultMemcard[i].c_str())); i?ChangePath(ID_MEMCARDPATH_B):ChangePath(ID_MEMCARDPATH_A); } } @@ -416,10 +416,10 @@ void CMemcardManager::OnMenuChange(wxCommandEvent& event) } break; case ID_MEMCARDPATH_A: - DefaultMemcard[SLOT_A] = m_MemcardPath[SLOT_A]->GetPath(); + DefaultMemcard[SLOT_A] = m_MemcardPath[SLOT_A]->GetPath().mb_str(); break; case ID_MEMCARDPATH_B: - DefaultMemcard[SLOT_B] = m_MemcardPath[SLOT_B]->GetPath(); + DefaultMemcard[SLOT_B] = m_MemcardPath[SLOT_B]->GetPath().mb_str(); break; default: m_MemcardList[SLOT_A]->column[event.GetId()] = !m_MemcardList[SLOT_A]->column[event.GetId()]; @@ -457,7 +457,7 @@ bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot) PanicAlert(E_UNK); break; } - PanicAlert(wxString::Format(wxT(E_OUTOFBLOCKS), memoryCard[slot]->GetFreeBlocks())); + PanicAlert(E_OUTOFBLOCKS, memoryCard[slot]->GetFreeBlocks()); break; case OUTOFDIRENTRIES: PanicAlert(E_OUTOFDIRENTRIES); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h index 3942b36f3c..09104e003a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h @@ -23,11 +23,11 @@ class GLWindow { int x, y; unsigned int depth;*/ - virtual void SwapBuffers() = 0; - virtual void SetWindowText(const char *text) = 0; - virtual bool PeekMessages() = 0; - virtual void Update() = 0; - virtual bool MakeCurrent() = 0; + virtual void SwapBuffers() {}; + virtual void SetWindowText(const char *text) {}; + virtual bool PeekMessages() {return false;}; + virtual void Update() {};; + virtual bool MakeCurrent() {return false;}; virtual void SetSize(u32 newWidth, u32 newHeight) { width = newWidth; height = newHeight; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h b/Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h index b8cbdf8c07..85d1e34000 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h @@ -32,6 +32,7 @@ public: #else class WXGLWindow : public GLWindow { + public: WXGLWindow(int _iwidth, int _iheight) {} }; #endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp index 86fa66a90b..efd1f61b61 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp @@ -18,7 +18,7 @@ #include "Globals.h" #include "IniFile.h" #include "svnrev.h" - +#include "Config.h" #include "Render.h" #include "nGLUtil.h" @@ -55,11 +55,11 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, g_VideoInitialize.pPeekMessages = &Callback_PeekMessages; g_VideoInitialize.pUpdateFPSDisplay = &UpdateFPSDisplay; - if (strncmp(iBackend, "sdl") == 0) + if (strncmp(g_Config.iBackend, "sdl") == 0) glWin = new SDLWindow(width, height); - else if (strncmp(iBackend, "x11") == 0) + else if (strncmp(g_Config.iBackend, "x11") == 0) glWin = new X11Window(width, height); - else if (strncmp(iBackend, "wxgl") == 0) + else if (strncmp(g_Config.iBackend, "wxgl") == 0) glWin = new WXGLWindow(width, height); return (glWin?true:false); @@ -95,6 +95,7 @@ u32 OpenGL_GetWidth() { u32 OpenGL_GetHeight() { return glWin->GetWidth(); +} void OpenGL_SetSize(u32 width, u32 height) { glWin->SetSize(width, height);