From 1e9bb4ed9af37e135cb4ebfca11787635a448d33 Mon Sep 17 00:00:00 2001
From: tmator <tmator@gmail.com>
Date: Sat, 1 Aug 2009 18:31:25 +0000
Subject: [PATCH] fix non gui build

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3921 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Core/Core/Src/Debugger/PPCDebugInterface.cpp  |  2 ++
 Source/Core/DebuggerUICommon/Src/SConscript       | 15 ++++++++-------
 Source/Core/DolphinWX/Src/MainNoGUI.cpp           |  2 --
 Source/Core/DolphinWX/Src/SConscript              | 14 ++++++++++----
 Source/Plugins/Plugin_DSP_LLE/Src/SConscript      | 14 ++++++++++----
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp       |  2 +-
 Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp |  2 ++
 7 files changed, 33 insertions(+), 18 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 += [
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
index 5b113e89b9..756750f5be 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
@@ -31,9 +31,15 @@ if env['HAVE_WX']:
 	]
 
 lleenv = env.Clone()
-lleenv.Append(
-	CXXFLAGS = [ '-fPIC' ],
-	LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util'  ],
-	)
+if env['HAVE_WX']:
+	lleenv.Append(
+		CXXFLAGS = [ '-fPIC' ],
+		LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util'  ],
+		)
+else:
+	lleenv.Append(
+		CXXFLAGS = [ '-fPIC' ],
+		LIBS = [ 'dspcore', 'audiocommon', 'common' ],
+		)
 
 lleenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index d5a18aadae..b54ad2321a 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -318,9 +318,9 @@ void Initialize(void *init)
     g_Config.Load();
     
 	g_Config.GameIniLoad();
-	g_Config.UpdateProjectionHack();
 
 #if defined(HAVE_WX) && HAVE_WX
+	g_Config.UpdateProjectionHack();
 	//Enable support for PNG screenshots.
 	wxImage::AddHandler( new wxPNGHandler );
 #endif
diff --git a/Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp b/Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp
index ff7d5ae66d..4a2199d28a 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/DataReports.cpp
@@ -261,7 +261,9 @@ void SendReportCoreAccelIr10Ext(u16 _channelID)
 	}
 	else if(g_Config.iExtensionConnected == EXT_GUITARHERO3_CONTROLLER)
 	{
+#if defined(HAVE_WX) && HAVE_WX
 		FillReportGuitarHero3Extension(_GH3_ext);
+#endif
 		memcpy(&pReport->ext, &_GH3_ext, sizeof(_GH3_ext));
 	}