We effectively only have a single namespace for private header files,
so the recent addition of VideoCommon/Src/Debugger.h clashed with DebuggerWX/Src/Debugger.h. The latter had atrophied anyway, so just get rid of it to resolve the conflict. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6526 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9dae1e9674
commit
a754f8e703
|
@ -15,10 +15,6 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
// #include "Debugger.h"
|
||||
// #include "Debugger/PPCDebugInterface.h"
|
||||
|
||||
// #include "PowerPC/SymbolDB.h"
|
||||
#include "Common.h"
|
||||
#include "StringUtil.h"
|
||||
#include "DebuggerUIUtil.h"
|
||||
|
@ -27,7 +23,6 @@
|
|||
#include "Host.h"
|
||||
#include "CodeView.h"
|
||||
#include "SymbolDB.h"
|
||||
// #include "JitWindow.h"
|
||||
|
||||
#include <wx/event.h>
|
||||
#include <wx/clipbrd.h>
|
||||
|
|
|
@ -784,10 +784,6 @@
|
|||
RelativePath=".\Src\CodeWindowFunctions.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\Debugger.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\JitWindow.cpp"
|
||||
>
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include "Common.h"
|
||||
#include "Host.h"
|
||||
#include "Debugger.h"
|
||||
#include "StringUtil.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
#include "BreakpointWindow.h"
|
||||
|
|
|
@ -15,9 +15,8 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
|
||||
#include "BreakpointView.h"
|
||||
#include "DebuggerUIUtil.h"
|
||||
#include "Debugger/Debugger_SymbolMap.h"
|
||||
#include "PowerPC/PPCSymbolDB.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "BreakpointView.h"
|
||||
#include "CodeWindow.h"
|
||||
#include "HW/Memmap.h"
|
||||
|
|
|
@ -28,8 +28,6 @@
|
|||
|
||||
#include "Host.h"
|
||||
|
||||
#include "Debugger.h"
|
||||
|
||||
#include "RegisterWindow.h"
|
||||
#include "BreakpointWindow.h"
|
||||
#include "MemoryWindow.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "Host.h"
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "DebuggerUIUtil.h"
|
||||
|
||||
#include "RegisterWindow.h"
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
// Copyright (C) 2003 Dolphin Project.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, version 2.0.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License 2.0 for more details.
|
||||
|
||||
// A copy of the GPL 2.0 should have been included with the program.
|
||||
// If not, see http://www.gnu.org/licenses/
|
||||
|
||||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#ifndef _DEBUGGER_H
|
||||
#define _DEBUGGER_H
|
||||
|
||||
#include <wx/wx.h>
|
||||
|
||||
#include "DebuggerUIUtil.h"
|
||||
|
||||
#include "IniFile.h"
|
||||
|
||||
#endif
|
|
@ -15,8 +15,6 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
|
||||
#include <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listctrl.h>
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <wx/listctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "MemoryView.h"
|
||||
#include "Thread.h"
|
||||
#include "CoreParameter.h"
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include "MemoryCheckDlg.h"
|
||||
#include "Common.h"
|
||||
#include "Debugger.h"
|
||||
#include "StringUtil.h"
|
||||
#include "Host.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
|
||||
#include <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listctrl.h>
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include <wx/dialog.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
#include "Debugger.h"
|
||||
#include "MemoryView.h"
|
||||
#include "Thread.h"
|
||||
#include "StringUtil.h"
|
||||
|
|
|
@ -15,10 +15,11 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
#include "DebuggerUIUtil.h"
|
||||
#include "RegisterView.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
#include "HW/ProcessorInterface.h"
|
||||
#include "IniFile.h"
|
||||
|
||||
// F-zero 80005e60 wtf??
|
||||
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Debugger.h"
|
||||
#include <wx/wx.h>
|
||||
|
||||
#include "RegisterWindow.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
#include "RegisterView.h"
|
||||
|
|
|
@ -72,7 +72,7 @@ void GFXDebuggerCheckAndPause(bool update)
|
|||
UpdateFPSDisplay("Paused by Video Debugger");
|
||||
|
||||
if (update) GFXDebuggerUpdateScreen();
|
||||
Sleep(5);
|
||||
SLEEP(5);
|
||||
}
|
||||
g_pdebugger->OnContinue();
|
||||
}
|
||||
|
|
|
@ -84,7 +84,7 @@ void GFXDebuggerUpdateScreen();
|
|||
#define GFX_DEBUGGER_PAUSE_AT(event,update)
|
||||
#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc)
|
||||
#define GFX_DEBUGGER_LOG_AT(event,dumpfunc)
|
||||
#endif ENABLE_GFX_DEBUGGER
|
||||
#endif // ENABLE_GFX_DEBUGGER
|
||||
|
||||
|
||||
#endif // _GFX_DEBUGGER_H_
|
||||
|
|
|
@ -8,7 +8,7 @@ files = [
|
|||
'BPStructs.cpp',
|
||||
'CPMemory.cpp',
|
||||
'CommandProcessor.cpp',
|
||||
'DebuggerPanel.cpp',
|
||||
'Debugger.cpp',
|
||||
'DLCache.cpp',
|
||||
'Fifo.cpp',
|
||||
'FramebufferManagerBase.cpp',
|
||||
|
|
Loading…
Reference in New Issue