summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-07-12 10:08:59 +0000
committerhrydgard <hrydgard@gmail.com>2009-07-12 10:08:59 +0000
commitb363b2ddc8a3731312a282569a3259dac10507d6 (patch)
tree4401fdf8b2359eadda0406d452fb05507a9e16cb /Source/Core
parentf324d4b27dce358b7824c445b2f2f3ac14f20dd2 (diff)
More UCode RE. Move MemoryView to DebuggerUICommon.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3762 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj8
-rw-r--r--Source/Core/DebuggerUICommon/Src/MemoryView.cpp (renamed from Source/Core/DebuggerWX/Src/MemoryView.cpp)2
-rw-r--r--Source/Core/DebuggerUICommon/Src/MemoryView.h (renamed from Source/Core/DebuggerWX/Src/MemoryView.h)2
-rw-r--r--Source/Core/DebuggerUICommon/Src/SConscript1
-rw-r--r--Source/Core/DebuggerWX/DebuggerWX.vcproj8
-rw-r--r--Source/Core/DebuggerWX/Src/SConscript1
6 files changed, 11 insertions, 11 deletions
diff --git a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
index 066e1d5629..fcb25c7e4d 100644
--- a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
+++ b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
@@ -420,6 +420,14 @@
>
</File>
<File
+ RelativePath=".\Src\MemoryView.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\MemoryView.h"
+ >
+ </File>
+ <File
RelativePath=".\Src\SConscript"
>
</File>
diff --git a/Source/Core/DebuggerWX/Src/MemoryView.cpp b/Source/Core/DebuggerUICommon/Src/MemoryView.cpp
index 0a3d2193cd..4e30732c94 100644
--- a/Source/Core/DebuggerWX/Src/MemoryView.cpp
+++ b/Source/Core/DebuggerUICommon/Src/MemoryView.cpp
@@ -15,7 +15,7 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
-#include "Debugger.h"
+#include "DebuggerUIUtil.h"
#include "Common.h"
#include "MemoryView.h"
diff --git a/Source/Core/DebuggerWX/Src/MemoryView.h b/Source/Core/DebuggerUICommon/Src/MemoryView.h
index 6a2d1b36e4..852fdc1a23 100644
--- a/Source/Core/DebuggerWX/Src/MemoryView.h
+++ b/Source/Core/DebuggerUICommon/Src/MemoryView.h
@@ -18,7 +18,7 @@
#ifndef MEMORYVIEW_H_
#define MEMORYVIEW_H_
-#include "Debugger.h"
+#include "DebuggerUIUtil.h"
#include "Common.h"
#include "DebugInterface.h"
diff --git a/Source/Core/DebuggerUICommon/Src/SConscript b/Source/Core/DebuggerUICommon/Src/SConscript
index 3f7e530e55..66df3477e4 100644
--- a/Source/Core/DebuggerUICommon/Src/SConscript
+++ b/Source/Core/DebuggerUICommon/Src/SConscript
@@ -4,6 +4,7 @@ Import('env')
files = [
'CodeView.cpp',
+ 'MemoryView.cpp',
'DebuggerUIUtil.cpp',
]
diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj
index 3f84875fb0..c550bb320a 100644
--- a/Source/Core/DebuggerWX/DebuggerWX.vcproj
+++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj
@@ -427,14 +427,6 @@
>
</File>
<File
- RelativePath=".\src\MemoryView.cpp"
- >
- </File>
- <File
- RelativePath=".\src\MemoryView.h"
- >
- </File>
- <File
RelativePath=".\src\RegisterView.cpp"
>
</File>
diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript
index d9ae5a9566..be39b14e37 100644
--- a/Source/Core/DebuggerWX/Src/SConscript
+++ b/Source/Core/DebuggerWX/Src/SConscript
@@ -12,7 +12,6 @@ files = [
"CodeWindow.cpp",
"CodeWindowSJP.cpp",
"MemoryCheckDlg.cpp",
- "MemoryView.cpp",
"MemoryWindow.cpp",
"RegisterWindow.cpp",
"RegisterView.cpp",