diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2009-02-23 06:17:57 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2009-02-23 06:17:57 +0000 |
| commit | 473cd01181be6c8160ce477f25ca6bd39f8cc083 (patch) | |
| tree | 5eac31ae8a5416f56e70b94e1330a7d58ec7ecd2 /Source/Core/Common | |
| parent | 578c402d2ce5e6a7b6e42a4c7449d9aeac61e5e2 (diff) | |
UUpdate svn:eol-style=native ( r1438 ) for Source/*.h
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2385 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/ColorUtil.h | 56 | ||||
| -rw-r--r-- | Source/Core/Common/Src/ConsoleWindow.h | 104 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Setup.h | 136 |
3 files changed, 148 insertions, 148 deletions
diff --git a/Source/Core/Common/Src/ColorUtil.h b/Source/Core/Common/Src/ColorUtil.h index 0f417a606d..c89676f575 100644 --- a/Source/Core/Common/Src/ColorUtil.h +++ b/Source/Core/Common/Src/ColorUtil.h @@ -1,28 +1,28 @@ -// 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 _COLORUTIL_H
-#define _COLORUTIL_H
-
-namespace ColorUtil
-{
-
-u32 Decode5A3(u16 val);
-
-} // namespace
-
-#endif
+// 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 _COLORUTIL_H +#define _COLORUTIL_H + +namespace ColorUtil +{ + +u32 Decode5A3(u16 val); + +} // namespace + +#endif diff --git a/Source/Core/Common/Src/ConsoleWindow.h b/Source/Core/Common/Src/ConsoleWindow.h index 2688d0bdb7..e897d11220 100644 --- a/Source/Core/Common/Src/ConsoleWindow.h +++ b/Source/Core/Common/Src/ConsoleWindow.h @@ -1,52 +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
+// 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/Setup.h b/Source/Core/Common/Src/Setup.h index d13d0e2dbf..302fdbe9f4 100644 --- a/Source/Core/Common/Src/Setup.h +++ b/Source/Core/Common/Src/Setup.h @@ -1,69 +1,69 @@ -// 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 __SETUP_h__
-#define __SETUP_h__
-
-////////////////////////////////////////////////////////////////////////////////////////
-// File description
-/* ŻŻŻŻŻŻŻŻŻŻŻŻ
-
- Compilation settings. I avoid placing this in Common.h or some place where lots of files needs
- to be rebuilt if any of these settings are changed. I'd rather have it in as few files as possible.
- This file can be kept on the ignore list in your SVN program. It allows local optional settings
- depending on what works on your computer.
-
-////////////////////////*/
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Settings
-// ŻŻŻŻŻŻŻŻŻŻŻŻ
-
-// This may remove sound artifacts in Wario Land Shake It and perhaps other games
-//#define SETUP_AVOID_SOUND_ARTIFACTS
-
-/* This may fix a problem with Stop and Start that I described in the comments to revision 2,139,
- and in the comments in the File Description for PluginManager.cpp */
-//#define SETUP_FREE_VIDEO_PLUGIN_ON_BOOT
-//#define SETUP_FREE_DSP_PLUGIN_ON_BOOT
-//#define SETUP_DONT_FREE_PLUGIN_ON_STOP
-
-/* This will avoid deleting the g_EmuThread after Stop, that may hang when we are rendering to a child
- window, however, I didn't seem to need this any more */
-//#define SETUP_AVOID_CHILD_WINDOW_RENDERING_HANG
-
-// Build with playback rerecording options
-//#define SETUP_AVOID_OPENGL_SCREEN_MESSAGE_HANG
-
-// Use a timer to wait for threads for stop instead of WaitForEternity()
-/* I tried that this worked with these options
- SETUP_FREE_VIDEO_PLUGIN_ON_BOOT
- SETUP_DONT_FREE_PLUGIN_ON_STOP
- then the Confirm on Close message box doesn't hang, and we have a controlled Shutdown process
- without any hanged threads. The downside is a few error messages in the ShutDown() of the
- OpenGL plugin, so I still need FreeLibrary() to clean it, even with this option. */
-//#define SETUP_TIMER_WAITING
-
-// Build with playback rerecording options
-//#define RERECORDING
-
-// Build with music modification
-//#define MUSICMOD
-
-///////////////////////////
-
+// 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 __SETUP_h__ +#define __SETUP_h__ + +//////////////////////////////////////////////////////////////////////////////////////// +// File description +/* ŻŻŻŻŻŻŻŻŻŻŻŻ + + Compilation settings. I avoid placing this in Common.h or some place where lots of files needs + to be rebuilt if any of these settings are changed. I'd rather have it in as few files as possible. + This file can be kept on the ignore list in your SVN program. It allows local optional settings + depending on what works on your computer. + +////////////////////////*/ + +//////////////////////////////////////////////////////////////////////////////////////// +// Settings +// ŻŻŻŻŻŻŻŻŻŻŻŻ + +// This may remove sound artifacts in Wario Land Shake It and perhaps other games +//#define SETUP_AVOID_SOUND_ARTIFACTS + +/* This may fix a problem with Stop and Start that I described in the comments to revision 2,139, + and in the comments in the File Description for PluginManager.cpp */ +//#define SETUP_FREE_VIDEO_PLUGIN_ON_BOOT +//#define SETUP_FREE_DSP_PLUGIN_ON_BOOT +//#define SETUP_DONT_FREE_PLUGIN_ON_STOP + +/* This will avoid deleting the g_EmuThread after Stop, that may hang when we are rendering to a child + window, however, I didn't seem to need this any more */ +//#define SETUP_AVOID_CHILD_WINDOW_RENDERING_HANG + +// Build with playback rerecording options +//#define SETUP_AVOID_OPENGL_SCREEN_MESSAGE_HANG + +// Use a timer to wait for threads for stop instead of WaitForEternity() +/* I tried that this worked with these options + SETUP_FREE_VIDEO_PLUGIN_ON_BOOT + SETUP_DONT_FREE_PLUGIN_ON_STOP + then the Confirm on Close message box doesn't hang, and we have a controlled Shutdown process + without any hanged threads. The downside is a few error messages in the ShutDown() of the + OpenGL plugin, so I still need FreeLibrary() to clean it, even with this option. */ +//#define SETUP_TIMER_WAITING + +// Build with playback rerecording options +//#define RERECORDING + +// Build with music modification +//#define MUSICMOD + +/////////////////////////// + #endif // __SETUP_h__
\ No newline at end of file |
