diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-12-23 14:18:14 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2017-01-10 05:24:44 -0500 |
| commit | ea8fc594a51785cf7b730df7e91fcf96bafca0ff (patch) | |
| tree | c3e645fe328c38b34ec99f2438764cb2011dfe53 /Source/Core/DolphinWX/Debugger | |
| parent | 45a875e2f257bc85392840125148d7c180eb5ac1 (diff) | |
Common: Move BreakPoints into Core
BreakPoints utilizes the jit global variable, so this was making Core and
Common cyclical dependencies on one another.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger')
5 files changed, 15 insertions, 10 deletions
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index db36092e62..363717a247 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Debugger/BreakpointDlg.h" + #include <string> #include <wx/dialog.h> #include <wx/msgdlg.h> #include <wx/sizer.h> #include <wx/textctrl.h> -#include "Common/BreakPoints.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" +#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/PowerPC.h" -#include "DolphinWX/Debugger/BreakpointDlg.h" #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp index 7a2ae27270..f8c6266849 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Debugger/BreakpointView.h" + #include <cstddef> #include <cstdio> #include <wx/listctrl.h> -#include "Common/BreakPoints.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" +#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" -#include "DolphinWX/Debugger/BreakpointView.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp index 7e83b4502e..f7d8f2b210 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Debugger/BreakpointWindow.h" + #include <array> // clang-format off @@ -12,16 +14,15 @@ #include <wx/panel.h> // clang-format on -#include "Common/BreakPoints.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Core/ConfigManager.h" #include "Core/HW/Memmap.h" +#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Debugger/BreakpointDlg.h" #include "DolphinWX/Debugger/BreakpointView.h" -#include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/MemoryCheckDlg.h" #include "DolphinWX/AuiToolBar.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 348363ae8d..1b60ca1252 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Debugger/CodeWindow.h" + #include <array> #include <chrono> #include <cstdio> @@ -23,7 +25,6 @@ #include <wx/aui/dockart.h> // clang-format on -#include "Common/BreakPoints.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" @@ -34,6 +35,7 @@ #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" #include "Core/Host.h" +#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PPCSymbolDB.h" @@ -41,7 +43,6 @@ #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/CodeView.h" -#include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/JitWindow.h" #include "DolphinWX/Debugger/MemoryWindow.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp index 9d1ca0ca5c..f9b1cf6510 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp @@ -2,18 +2,19 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Debugger/MemoryCheckDlg.h" + #include <string> #include <wx/radiobut.h> #include <wx/sizer.h> #include <wx/stattext.h> #include <wx/textctrl.h> -#include "Common/BreakPoints.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" +#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Debugger/BreakpointWindow.h" -#include "DolphinWX/Debugger/MemoryCheckDlg.h" #include "DolphinWX/WxUtils.h" MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent) |