diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-01-17 14:28:09 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-01-17 14:28:09 +0000 |
| commit | ae9cfbd8e3672e78bb56ed763c6285f2bfbfbf99 (patch) | |
| tree | 253f74cd82833f7ba4eff970688668b15ca045be /Source/Core/Common | |
| parent | 7f9ce70b330c6b3776322ccfa3c1509916b5f5c5 (diff) | |
Common: Moved Windows console functions to common
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1887 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Common.vcproj | 8 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 3 | ||||
| -rw-r--r-- | Source/Core/Common/Src/ConsoleWindow.h | 52 | ||||
| -rw-r--r-- | Source/Core/Common/Src/DynamicLibrary.cpp | 3 |
4 files changed, 61 insertions, 5 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; |