Fix *BSD build.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7006 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 15 insertions, 21 deletions

diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 9ebdd5114c..23ce1fcc4d 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -7,17 +7,10 @@ from SconsTests import utils
 
 files = ['BootManager.cpp']
 
-# 'plugin_videosoftware',
-libs = [
-	'core', 'discio', 'plugin_videoogl', 
-	'audiocommon', 'common', 'inputcommon', 'videocommon',
-	'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z',
-	]
-
-wxlibs = [ ]
-
 ldflags = [ ]
 
+libs = [ ]
+
 if not env['HAVE_WX']:
 	files += ['MainNoGUI.cpp']
 else:
@@ -56,7 +49,13 @@ else:
 
 	env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
 
-	wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
+	libs += ['debwx', 'debugger_ui_util', 'dolphinwx']
+
+libs += ['core', 'discio', 'plugin_videoogl'] # 'plugin_videosoftware'
+if env['HAVE_WX']:
+	libs += ['videouicommon']
+libs += ['audiocommon', 'common', 'inputcommon', 'videocommon']
+libs +=	['GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z']
 
 if sys.platform == 'win32':
 	files += [ "stdafx.cpp" ]
@@ -67,7 +66,7 @@ elif sys.platform == 'darwin':
 	exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
 
 	if env['HAVE_WX']:
-		wxlibs += env['wxconfiglibs']
+		libs += env['wxconfiglibs']
 	else:
 		libs += [ 'iconv' ]
 		exe += 'NoGUI'
@@ -133,10 +132,6 @@ else:
 	env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
 	env.InstallAs(env['data_dir'] + '/user', '#Data/User')
 
-libs = wxlibs + libs + env['LIBS']
 linkflags = ldflags + env['LINKFLAGS']
 
-if env['HAVE_WX']:
-	libs += ['videouicommon']
-
-env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)
+env.Program(exe, files, LIBS = libs + env['LIBS'], LINKFLAGS = linkflags)
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index 6ffe8d04ad..d723570fe5 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -26,11 +26,6 @@
 #include "VertexShaderGen.h"
 #include "NativeVertexFormat.h"
 
-GFXDebuggerBase *g_pdebugger = NULL;
-volatile bool GFXDebuggerPauseFlag = false;
-volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE;
-volatile int GFXDebuggerEventToPauseCount = 0;
-
 //void UpdateFPSDisplay(const char *text);
 extern NativeVertexFormat *g_nativeVertexFmt;
 
diff --git a/Source/Core/VideoUICommon/Src/DebuggerPanel.cpp b/Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
index 45d6fbbe24..9907e69f2c 100644
--- a/Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
+++ b/Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
@@ -41,6 +41,10 @@ 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;
 
 GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position,
 									const wxSize& size, long style, const wxString &title)