diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-12-05 15:28:31 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-12-05 15:28:31 +0000 |
| commit | a754f8e703706678757a24fcee4285ef796db39b (patch) | |
| tree | fed0802e42b766f9f0e0562149dadd0cfca597f7 /Source/Core/VideoCommon | |
| parent | 9dae1e9674a1da829221646f29cd7e1b4324a588 (diff) | |
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
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/Debugger.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/Debugger.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp index ac7ae3fb45..6ed390c84f 100644 --- a/Source/Core/VideoCommon/Src/Debugger.cpp +++ b/Source/Core/VideoCommon/Src/Debugger.cpp @@ -72,7 +72,7 @@ void GFXDebuggerCheckAndPause(bool update) UpdateFPSDisplay("Paused by Video Debugger"); if (update) GFXDebuggerUpdateScreen(); - Sleep(5); + SLEEP(5); } g_pdebugger->OnContinue(); } diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h index a247b76b8c..47099f239a 100644 --- a/Source/Core/VideoCommon/Src/Debugger.h +++ b/Source/Core/VideoCommon/Src/Debugger.h @@ -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_ diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 7bcd004762..8d71832058 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -8,7 +8,7 @@ files = [ 'BPStructs.cpp', 'CPMemory.cpp', 'CommandProcessor.cpp', - 'DebuggerPanel.cpp', + 'Debugger.cpp', 'DLCache.cpp', 'Fifo.cpp', 'FramebufferManagerBase.cpp', |