4 files changed, 20 insertions, 13 deletions
diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
index af4133258f..c6df884c65 100644
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
+++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
@@ -184,7 +184,9 @@ void PPCDebugInterface::setPC(unsigned int address)
 
 void PPCDebugInterface::showJitResults(unsigned int address) 
 {
+#if !defined(HAVE_WX) && !HAVE_WX
 	Host_ShowJitResults(address);
+#endif
 }
 
 void PPCDebugInterface::runToBreakpoint()
diff --git a/Source/Core/DebuggerUICommon/Src/SConscript b/Source/Core/DebuggerUICommon/Src/SConscript
index f7be043239..c912420c41 100644
--- a/Source/Core/DebuggerUICommon/Src/SConscript
+++ b/Source/Core/DebuggerUICommon/Src/SConscript
@@ -1,13 +1,14 @@
 # -*- python -*-
 
 Import('env')
-files = [] #So it's declared outside the if
-if env['HAVE_WX']:
-	files += [
-		'CodeView.cpp',
-		'DebuggerUIUtil.cpp',
-		'MemoryView.cpp',
-		]
+
+if not env['HAVE_WX']:
+	Return()
+files += [
+	'CodeView.cpp',
+	'DebuggerUIUtil.cpp',
+	'MemoryView.cpp',
+	]
 
 acenv = env.Clone()
 acenv.Append(CXXFLAGS = [ '-fPIC' ])
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index f8bd0597bd..d0dd996718 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -49,7 +49,6 @@
 #include "BootManager.h"
 void* g_pCodeWindow = NULL;
 void* main_frame = NULL;
-LogManager *logManager = NULL;
 
 // OK, this thread boundary is DANGEROUS on linux
 // wxPostEvent / wxAddPendingEvent is the solution.
@@ -214,7 +213,6 @@ int main(int argc, char* argv[])
 		return(1);
 	}
 	std::string bootFile(args_info.inputs[0]);
-	logManager = (LogManager *)CPluginManager::GetInstance().GetGlobals()->logManager;
 
 	updateMainFrameEvent.Init();
 	cpu_info.Detect();
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index a2bc4bd8e9..e1aaee59e8 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -10,10 +10,16 @@ files = [
 	'cmdline.c',
 	]
 
-libs = [
-	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
-	'common', 'z', 'debugger_ui_util'
-	]
+if wxenv['HAVE_WX']:
+	libs = [
+		'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
+		'common', 'z', 'debugger_ui_util'
+		]
+else:
+	libs = [
+		'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
+		'common', 'z'
+		]
 
 if wxenv['HAVE_WX']:
 	files += [