diff options
| author | omegadox <omegadox@gmail.com> | 2009-01-24 00:45:46 +0000 |
|---|---|---|
| committer | omegadox <omegadox@gmail.com> | 2009-01-24 00:45:46 +0000 |
| commit | 8f98f0b778dcf600febdc6b2fe6ec9d122406f29 (patch) | |
| tree | b567f2189ab0449c0829fc937d3c627d355425c4 /Source/Core/DebuggerWX | |
| parent | 70bc8167f8af6aa053b9335209c80f554d8fb597 (diff) | |
Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX')
| -rw-r--r-- | Source/Core/DebuggerWX/DebuggerWX.vcproj | 46 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/Debugger.cpp | 19 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/MemoryView.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/SConscript | 1 |
4 files changed, 42 insertions, 26 deletions
diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index f71ee20ce3..055de87318 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -265,7 +265,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="comctl32.lib rpcrt4.lib"
+ AdditionalDependencies="rpcrt4.lib"
/>
<Tool
Name="VCALinkTool"
@@ -464,22 +464,62 @@ <File
RelativePath=".\resources\toolbar_add_breakpoint.c"
>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\resources\toolbar_add_memorycheck.c"
>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\resources\toolbar_delete.c"
>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\resources\toolbar_pause.c"
>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\resources\toolbar_play.c"
>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
<File
@@ -551,10 +591,6 @@ >
</File>
<File
- RelativePath=".\src\Debugger.cpp"
- >
- </File>
- <File
RelativePath=".\src\Debugger.h"
>
</File>
diff --git a/Source/Core/DebuggerWX/Src/Debugger.cpp b/Source/Core/DebuggerWX/Src/Debugger.cpp deleted file mode 100644 index 2bf8df55ff..0000000000 --- a/Source/Core/DebuggerWX/Src/Debugger.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2003-2008 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/ - -#include "Debugger.h" - diff --git a/Source/Core/DebuggerWX/Src/MemoryView.cpp b/Source/Core/DebuggerWX/Src/MemoryView.cpp index 020caa29c4..338bbeef94 100644 --- a/Source/Core/DebuggerWX/Src/MemoryView.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryView.cpp @@ -212,7 +212,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event) int src, dst, srcAddr; }; - branch branches[256]; + // branch branches[256]; // TODO: This is not being used int numBranches = 0; // TODO: Add any drawing code here... int width = rc.width; diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript index 59ec56c32a..044509d665 100644 --- a/Source/Core/DebuggerWX/Src/SConscript +++ b/Source/Core/DebuggerWX/Src/SConscript @@ -13,7 +13,6 @@ files = ["LogWindow.cpp", "CodeWindow.cpp", "CodeWindowSJP.cpp", "CodeView.cpp", - "Debugger.cpp", "MemoryCheckDlg.cpp", "MemoryView.cpp", "MemoryWindow.cpp", |