From 0099b5c95732335c575d306def2aaf445654c8ba Mon Sep 17 00:00:00 2001
From: magumagu9 <magumagu9@gmail.com>
Date: Sat, 17 Jan 2009 19:59:20 +0000
Subject: [PATCH] Misc Linux build fixes in the wake of r1887; still doesn't
 work right because Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Logging.cpp
 appears to be missing, and I haven't looked at the fallout of r1884 yet.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1897 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/SConscript              | 1 +
 Source/Plugins/Plugin_DSP_HLE/Src/SConscript   | 2 +-
 Source/Plugins/Plugin_DSP_LLE/Src/SConscript   | 1 -
 Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp | 9 +++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 46b4f8fabf..04d08f8d97 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -6,6 +6,7 @@ files = [
 	"ABI.cpp",
 	"MsgHandler.cpp",
 	"ChunkFile.cpp",
+	"ConsoleWindow.cpp",
 	"CPUDetect.cpp",
 	"DynamicLibrary.cpp",
 	"Hash.cpp",
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
index 7102508fc0..3fc6a4eeef 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@@ -36,7 +36,7 @@ if dspenv['HAVE_WX']:
         'Debugger/PBView.cpp',
         'Debugger/Mails.cpp',
         'Debugger/Blocks.cpp',
-        'Logging/Logging.cpp',
+        'Debugger/Logging.cpp',
 
         ]
 
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
index 97769e1463..4061859b81 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
@@ -32,7 +32,6 @@ files = [
 #        "stdafx.cpp",
 	"Tools.cpp",
         "Logging/AXTask.cpp",
-        "Logging/Console.cpp",
         "Logging/Logging.cpp",
         "Logging/ReadPBs.cpp",
 	]
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
index 58fee09b0d..f5fbb1be2f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
@@ -54,6 +54,15 @@ void CloseConsole()
 {
 	Console::Close();
 }
+#else
+// Dummy functions for console open/close
+void OpenConsole()
+{
+}
+
+void CloseConsole()
+{
+}
 #endif
 //////////////////////////////////