piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

We effectively only have a single namespace for private header files,

Browse Source 
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:
Soren Jorvang
2010-12-05 15:28:31 +00:00
parent 9dae1e9674
commit a754f8e703
19 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/Debugger.cpp
View File

@ -72,7 +72,7 @@ void GFXDebuggerCheckAndPause(bool update)
UpdateFPSDisplay("Paused by Video Debugger");
if (update) GFXDebuggerUpdateScreen();
Sleep(5);
SLEEP(5);
}
g_pdebugger->OnContinue();
}

2
Source/Core/VideoCommon/Src/Debugger.h
View File

@ -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_

2
Source/Core/VideoCommon/Src/SConscript
View File

@ -8,7 +8,7 @@ files = [
'BPStructs.cpp',
'CPMemory.cpp',
'CommandProcessor.cpp',
'DebuggerPanel.cpp',
'Debugger.cpp',
'DLCache.cpp',
'Fifo.cpp',
'FramebufferManagerBase.cpp',