From e9f3d50eca60a162cadcbbbfe00d3dc373098953 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 16 Feb 2011 12:09:39 +0000 Subject: [PATCH] Fix nowx Debug build. Yes, people use that\! git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7182 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp | 9 +++++---- Source/Core/VideoCommon/Src/Debugger.cpp | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp index 3ba50d2d8d..373f84bc4a 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp @@ -41,10 +41,11 @@ BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel) EVT_BUTTON(ID_CLEAR_PIXEL_SHADER_CACHE,GFXDebuggerPanel::OnClearPixelShaderCacheButton) END_EVENT_TABLE() -GFXDebuggerBase *g_pdebugger = NULL; -volatile bool GFXDebuggerPauseFlag = false; -volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; -volatile int GFXDebuggerEventToPauseCount = 0; +// From VideoCommon +extern GFXDebuggerBase *g_pdebugger; +extern volatile bool GFXDebuggerPauseFlag; +extern volatile PauseEvent GFXDebuggerToPauseAtNext; +extern volatile int GFXDebuggerEventToPauseCount; GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position, const wxSize& size, long style, const wxString &title) diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp index b808c63c11..13a8138c46 100644 --- a/Source/Core/VideoCommon/Src/Debugger.cpp +++ b/Source/Core/VideoCommon/Src/Debugger.cpp @@ -29,6 +29,11 @@ //void UpdateFPSDisplay(const char *text); extern NativeVertexFormat *g_nativeVertexFmt; +GFXDebuggerBase *g_pdebugger = NULL; +volatile bool GFXDebuggerPauseFlag = false; +volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; +volatile int GFXDebuggerEventToPauseCount = 0; + void GFXDebuggerUpdateScreen() { // TODO: Implement this in a backend-independent way