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

compile fixes 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1613 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-20 19:40:20 +00:00
parent 3be88bb2dd
commit 422437824c
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp
View File

@ -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

16
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -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++;

2
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View File

@ -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"

8
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -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);

10
Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
View File

@ -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;

1
Source/Plugins/Plugin_VideoOGL/Src/WXGLWindow.h
View File

@ -32,6 +32,7 @@ public:
#else
class WXGLWindow : public GLWindow
{
public:
WXGLWindow(int _iwidth, int _iheight) {}
};
#endif

9
Source/Plugins/Plugin_VideoOGL/Src/nGLUtil.cpp
View File

@ -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);