Common: Moved Windows console functions to common

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

8 files changed, 113 insertions, 58 deletions

diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 9f7a054811..8e1c43c000 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -567,6 +567,14 @@
 			>

 		</File>

 		<File

+			RelativePath=".\Src\ConsoleWindow.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\ConsoleWindow.h"

+			>

+		</File>

+		<File

 			RelativePath=".\Src\CPUDetect.cpp"

 			>

 		</File>

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index a0fbeae3ea..7df31f7cb7 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -36,9 +36,6 @@
 		#define LOGGING
 	#endif
 
-	// Allow wxWidgets in Core
-	//#define WX_CORE
-
 	#include "../../../PluginSpecs/CommonTypes.h"
 	#define HAVE_WIIUSE 1
 	#define HAVE_WX 1
diff --git a/Source/Core/Common/Src/ConsoleWindow.h b/Source/Core/Common/Src/ConsoleWindow.h
new file mode 100644
index 0000000000..2688d0bdb7
--- /dev/null
+++ b/Source/Core/Common/Src/ConsoleWindow.h
@@ -0,0 +1,52 @@
+// Copyright (C) 2003-2008 Dolphin Project.

+

+// This program is free software: you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation, version 2.0.

+

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License 2.0 for more details.

+

+// A copy of the GPL 2.0 should have been included with the program.

+// If not, see http://www.gnu.org/licenses/

+

+// Official SVN repository and contact information can be found at

+// http://code.google.com/p/dolphin-emu/

+

+#ifndef _CONSOLE_H

+#define _CONSOLE_H

+

+//////////////////////////////////////////////////////////////////////////////////////////

+// Includes

+// ŻŻŻŻŻŻŻŻŻŻŻŻŻ

+#include <iostream>

+#ifdef _WIN32

+	#include <windows.h>

+#endif

+//////////////////////////////

+

+//////////////////////////////////////////////////////////////////////////////////////////

+// Declarations

+// ŻŻŻŻŻŻŻŻŻŻŻŻŻ

+namespace Console

+{

+

+// Settings

+extern bool WriteToFile;

+

+// Functions

+void Open(int Width = 80, int Height = 100, char * Name = "Console", bool File = false);

+void Close();

+int Print(const char *fmt, ...);

+void ClearScreen();

+#ifdef _WIN32

+	HWND GetHwnd(void);

+#endif

+

+} // Console

+///////////////////////////////

+

+

+#endif // _CONSOLE_H

diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp
index 4b5f61af5f..47da8e89e3 100644
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@@ -40,7 +40,6 @@ and stopped.
 #include "FileUtil.h"
 #include "StringUtil.h"
 #include "DynamicLibrary.h"
-#include "../../../../Branches/MusicMod/Common/Src/Console.h" 
 ///////////////////////////////////
 
 
@@ -157,7 +156,7 @@ void* DynamicLibrary::Get(const char* funcname) const
 	if (!retval)
 	{
 		LOG(MASTER_LOG, "Symbol %s missing in %s (error: %s)\n", funcname, library_file.c_str(), GetLastErrorAsString().c_str());
-		PanicAlert("Symbol %s missing in %s (error: %s)\n", funcname, library_file.c_str(), GetLastErrorAsString().c_str());
+		//PanicAlert("Symbol %s missing in %s (error: %s)\n", funcname, library_file.c_str(), GetLastErrorAsString().c_str());
 	}
 
 	return retval;
diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index 144dcb103f..a8d6ab7dcf 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="Core"

 	ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"

 	RootNamespace="Core"

@@ -1001,166 +1001,166 @@
 			</File>

 		</Filter>

 		<Filter

-			Name="IPC HLE"

+			Name="Boot"

 			>

 			<File

-				RelativePath=".\Src\IPC_HLE\hci.h"

+				RelativePath=".\Src\Boot\Boot.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\l2cap.h"

+				RelativePath=".\Src\Boot\Boot.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE.cpp"

+				RelativePath=".\Src\Boot\Boot_BIOSEmu.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE.h"

+				RelativePath=".\Src\Boot\Boot_DOL.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device.h"

+				RelativePath=".\Src\Boot\Boot_DOL.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp"

+				RelativePath=".\Src\Boot\Boot_ELF.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_DI.h"

+				RelativePath=".\Src\Boot\Boot_ELF.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_Error.h"

+				RelativePath=".\Src\Boot\ElfReader.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_es.h"

+				RelativePath=".\Src\Boot\ElfReader.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp"

+				RelativePath=".\Src\Boot\ElfTypes.h"

 				>

 			</File>

+		</Filter>

+		<Filter

+			Name="ActionReplay"

+			>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h"

+				RelativePath=".\Src\ActionReplay.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"

+				RelativePath=".\Src\ActionReplay.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.h"

+				RelativePath=".\Src\ARDecrypt.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"

+				RelativePath=".\Src\ARDecrypt.h"

 				>

 			</File>

+		</Filter>

+		<Filter

+			Name="IPC HLE"

+			>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.h"

+				RelativePath=".\Src\IPC_HLE\hci.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp"

+				RelativePath=".\Src\IPC_HLE\l2cap.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_stm.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_usb.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_DI.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_Error.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_es.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp"

 				>

 			</File>

-		</Filter>

-		<Filter

-			Name="Boot"

-			>

 			<File

-				RelativePath=".\Src\Boot\Boot.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot_BIOSEmu.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot_DOL.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot_DOL.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot_ELF.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\Boot_ELF.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\ElfReader.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_stm.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\ElfReader.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\Boot\ElfTypes.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_usb.h"

 				>

 			</File>

-		</Filter>

-		<Filter

-			Name="ActionReplay"

-			>

 			<File

-				RelativePath=".\Src\ActionReplay.cpp"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\ActionReplay.h"

+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\ARDecrypt.cpp"

+				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\ARDecrypt.h"

+				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"

 				>

 			</File>

 		</Filter>

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 1c61df2ea4..718d85f95e 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -25,7 +25,6 @@
 #include "../Core.h" // Local core functions
 #include "../Debugger/Debugger_SymbolMap.h"
 #include "../Host.h"
-#include "../../../../Branches/MusicMod/Common/Src/Console.h"
 ///////////////////////
 
 
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 8dfcf72d5c..e575304644 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="DolphinWX"

 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"

 	RootNamespace="DolphinWX"

@@ -30,7 +30,7 @@
 			<Tool

 				Name="VCPreBuildEventTool"

 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"

-				ExcludedFromBuild="false"

+				ExcludedFromBuild="true"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -131,7 +131,7 @@
 				Name="VCPostBuildEventTool"

 				Description="Copying Data\* to $(TargetDir)"

 				CommandLine="xcopy &quot;$(SolutionDir)..\Data&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\Win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"

-				ExcludedFromBuild="false"

+				ExcludedFromBuild="true"

 			/>

 		</Configuration>

 		<Configuration

diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index 91fa5218bd..47f84b2bf3 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -55,7 +55,7 @@
 	#include "ConfigMain.h"
 	#include "Frame.h"
 	#include "CodeWindow.h"
-	#include "../../../../Branches/MusicMod/Common/Src/Console.h" 
+	#include "../../../Branches/MusicMod/Main/Src/Setup.h" 
 	#ifdef MUSICMOD
 		#include "../../../Branches/MusicMod/Main/Src/Main.h"  // MusicMod
 	#endif