diff --git a/SConstruct b/SConstruct
index 0f25272824..5a4a2303e6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -148,7 +148,7 @@ if sys.platform == 'darwin':
         wxconfig.ParseWXConfig(wxenv)
         env['CPPDEFINES'] += ['__WXOSX_COCOA__']
         env['CPPPATH'] += wxenv['CPPPATH']
-        env['LIBPATH'] += wxenv['LIBPATH']
+        #env['LIBPATH'] += wxenv['LIBPATH']
         env['wxconfiglibs'] = wxenv['LIBS']
 
     env['CPPPATH'] += ['#Externals']
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
index eae192e180..a3972f26d2 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
@@ -28,7 +28,6 @@ class IUCode;
 class DSPHLE : public PluginDSP {
 public:
 	DSPHLE();
-	~DSPHLE();
 
 	virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread);
 	virtual void Shutdown();
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
index f84d630559..80e47c2809 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
@@ -48,9 +48,6 @@ DSPLLE::DSPLLE() {
 	m_cycle_count = 0;
 }
 
-DSPLLE::~DSPLLE() {
-}
-
 void DSPLLE::DoState(PointerWrap &p)
 {
 	p.Do(m_InitMixer);
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
index 61c87d9e13..10ce96744e 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
@@ -26,7 +26,6 @@
 class DSPLLE : public PluginDSP {
 public:
 	DSPLLE();
-	~DSPLLE();
 
 	virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread);
 	virtual void Shutdown();
diff --git a/Source/Core/Core/Src/PluginDSP.cpp b/Source/Core/Core/Src/PluginDSP.cpp
index 5a4b5d1b06..33a98a18fb 100644
--- a/Source/Core/Core/Src/PluginDSP.cpp
+++ b/Source/Core/Core/Src/PluginDSP.cpp
@@ -33,6 +33,3 @@ PluginDSP *CreateDSPPlugin(bool HLE)
 		return new DSPLLE();
 	}
 }
-
-PluginDSP::PluginDSP() {}
-PluginDSP::~PluginDSP() {}
diff --git a/Source/Core/Core/Src/PluginDSP.h b/Source/Core/Core/Src/PluginDSP.h
index bf68dcffee..56b918bf5a 100644
--- a/Source/Core/Core/Src/PluginDSP.h
+++ b/Source/Core/Core/Src/PluginDSP.h
@@ -25,8 +25,7 @@
 class PluginDSP
 {
 public:
-	PluginDSP();
-	~PluginDSP();
+	virtual ~PluginDSP() {}
 
 	virtual bool IsLLE() = 0;
 
diff --git a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h b/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
index 5163d2034b..d7d412701d 100644
--- a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
+++ b/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
@@ -21,6 +21,8 @@
 class CPUCoreBase
 {
 public:
+	virtual ~CPUCoreBase() {}
+
 	virtual void Init() = 0;
 	virtual void Shutdown() = 0;
 	virtual void ClearCache() = 0;
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index a9d1f6ff92..21a72272f6 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -105,7 +105,7 @@ void PadSettingCheckBox::UpdateValue()
 
 void PadSettingSpin::UpdateGUI()
 {
-	((wxSpinCtrl*)wxcontrol)->SetValue(value * 100);
+	((wxSpinCtrl*)wxcontrol)->SetValue((int)(value * 100));
 }
 
 void PadSettingSpin::UpdateValue()
@@ -536,7 +536,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wx
 
 	range_slider = new wxSlider(parent, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/);
 
-	range_slider->SetValue(control_reference->range * SLIDER_TICK_COUNT);
+	range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT));
 
 	_connect_macro_(detect_button, ControlDialog::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
 	_connect_macro_(clear_button, ControlDialog::ClearControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index 58560dfb4a..15ff85fbc5 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -74,7 +74,7 @@ class PadSettingSpin : public PadSetting
 public:
 	PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting)
 		: PadSetting(new wxSpinCtrl(parent, -1, wxEmptyString, wxDefaultPosition
-			, wxSize(54, -1), 0, setting->low, setting->high, setting->value * 100))
+			, wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100)))
 		, value(setting->value) {}
 
 	void UpdateGUI();
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index e6ded162c2..d1a125b355 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -5,9 +5,7 @@ import os
 import sys
 from SconsTests import utils
 
-files = [
-	'BootManager.cpp',
-	]
+files = ['BootManager.cpp']
 
 libs = [
 	'core',
@@ -19,8 +17,12 @@ wxlibs = [ ]
 
 ldflags = [ ]
 
-if env['HAVE_WX']:
-	files += [
+if not env['HAVE_WX']:
+	files += ['MainNoGUI.cpp']
+else:
+	files += ['Main.cpp']
+
+	libfiles = [
 		'AboutDolphin.cpp',
 		'ARCodeAddEdit.cpp',
 		'GeckoCodeDiag.cpp',
@@ -38,7 +40,6 @@ if env['HAVE_WX']:
 		'ISOProperties.cpp',
 		'PatchAddEdit.cpp',
 		'CheatsWindow.cpp',
-		'Main.cpp',
 		'MemcardManager.cpp',
 		'MemoryCards/GCMemcard.cpp',
 		'MemoryCards/WiiSaveCrypted.cpp',
@@ -52,11 +53,9 @@ if env['HAVE_WX']:
 		'WxUtils.cpp',
 		]
 
-	wxlibs += [ 'debwx', 'debugger_ui_util' ]
-else:
-	files += [
-		'MainNoGUI.cpp',
-		]
+	env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
+
+	wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
 
 if sys.platform == 'win32':
 	files += [ "stdafx.cpp" ]
diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h
index 47099f239a..bcce50f223 100644
--- a/Source/Core/VideoCommon/Src/Debugger.h
+++ b/Source/Core/VideoCommon/Src/Debugger.h
@@ -21,6 +21,8 @@
 class GFXDebuggerBase
 {
 public:
+	virtual ~GFXDebuggerBase() {}
+
 	// if paused, debugging functions can be enabled
 	virtual void OnPause() {};
 	virtual void OnContinue() {};