diff --git a/Source/Core/Core/Src/Console.cpp b/Source/Core/Core/Src/Console.cpp index 6b4c89b5a3..b2ef092e8d 100644 --- a/Source/Core/Core/Src/Console.cpp +++ b/Source/Core/Core/Src/Console.cpp @@ -15,8 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ #include - -#include "string.h" +#include #include "Common.h" #include "Thread.h" @@ -74,10 +73,10 @@ void Console_Submit(const char *cmd) sscanf(cmd, "%s %08x", temp, &addr); if (addr!=0) - { -#ifdef LOGGING - u32 EA = -#endif + { +#ifdef LOGGING + u32 EA = +#endif Memory::CheckDTLB(addr, Memory::FLAG_NO_EXCEPTION); LOG(CONSOLE, "EA 0x%08x to 0x%08x", addr, EA); } diff --git a/Source/Core/DebuggerWX/src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/src/BreakpointWindow.cpp index b9e9b9b5d6..52745456b4 100644 --- a/Source/Core/DebuggerWX/src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/src/BreakpointWindow.cpp @@ -24,7 +24,7 @@ #include "MemoryCheckDlg.h" #include "IniFile.h" -#include "wx/mstream.h" +#include extern "C" { #include "../resources/toolbar_add_breakpoint.c" diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp index c3bcf58cbe..aa3fa8c0ea 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp @@ -15,12 +15,12 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "wx/button.h" -#include "wx/textctrl.h" -#include "wx/textdlg.h" -#include "wx/listctrl.h" -#include "wx/thread.h" -#include "wx/mstream.h" +#include +#include +#include +#include +#include +#include // ugly that this lib included code from the main #include "../../DolphinWX/src/Globals.h" diff --git a/Source/Core/DebuggerWX/src/CodeWindow.h b/Source/Core/DebuggerWX/src/CodeWindow.h index dbdd1c826b..b092c03bac 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.h +++ b/Source/Core/DebuggerWX/src/CodeWindow.h @@ -18,9 +18,9 @@ #ifndef CODEWINDOW_H_ #define CODEWINDOW_H_ -#include "wx/dialog.h" -#include "wx/textctrl.h" -#include "wx/listbox.h" +#include +#include +#include #include "Debugger.h" #include "CodeView.h" #include "Thread.h" diff --git a/Source/Core/DebuggerWX/src/Debugger.h b/Source/Core/DebuggerWX/src/Debugger.h index 693050d490..62b10b3556 100644 --- a/Source/Core/DebuggerWX/src/Debugger.h +++ b/Source/Core/DebuggerWX/src/Debugger.h @@ -31,7 +31,7 @@ enum #define wxUSE_XPM_IN_MSW 1 #define USE_XPM_BITMAPS 1 -#include "wx/wx.h" +#include // define this to use XPMs everywhere (by default, BMPs are used under Win) // BMPs use less space, but aren't compiled into the executable on other platforms diff --git a/Source/Core/DebuggerWX/src/JitWindow.cpp b/Source/Core/DebuggerWX/src/JitWindow.cpp index d859c46e52..c6a207c620 100644 --- a/Source/Core/DebuggerWX/src/JitWindow.cpp +++ b/Source/Core/DebuggerWX/src/JitWindow.cpp @@ -19,11 +19,11 @@ #include "IniFile.h" -#include "wx/button.h" -#include "wx/textctrl.h" -#include "wx/listctrl.h" -#include "wx/thread.h" -#include "wx/listctrl.h" +#include +#include +#include +#include +#include #include "JitWindow.h" #include "HW/CPU.h" #include "PowerPC/PowerPC.h" diff --git a/Source/Core/DebuggerWX/src/JitWindow.h b/Source/Core/DebuggerWX/src/JitWindow.h index 4b8d0c0b15..7da51a3f08 100644 --- a/Source/Core/DebuggerWX/src/JitWindow.h +++ b/Source/Core/DebuggerWX/src/JitWindow.h @@ -20,10 +20,10 @@ #include -#include "wx/dialog.h" -#include "wx/textctrl.h" -#include "wx/listctrl.h" -#include "wx/listbox.h" +#include +#include +#include +#include #include "Debugger.h" #include "MemoryView.h" #include "Thread.h" diff --git a/Source/Core/DebuggerWX/src/LogWindow.cpp b/Source/Core/DebuggerWX/src/LogWindow.cpp index de74d0a8e3..b329192de9 100644 --- a/Source/Core/DebuggerWX/src/LogWindow.cpp +++ b/Source/Core/DebuggerWX/src/LogWindow.cpp @@ -18,10 +18,10 @@ #include "Debugger.h" #include "LogManager.h" -#include "wx/button.h" -#include "wx/textctrl.h" -#include "wx/listbox.h" -#include "wx/checklst.h" +#include +#include +#include +#include #include "LogWindow.h" #include "Console.h" diff --git a/Source/Core/DebuggerWX/src/MemoryWindow.cpp b/Source/Core/DebuggerWX/src/MemoryWindow.cpp index 1c7906025d..47c4fb7d1b 100644 --- a/Source/Core/DebuggerWX/src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/src/MemoryWindow.cpp @@ -19,11 +19,11 @@ #include "IniFile.h" -#include "wx/button.h" -#include "wx/textctrl.h" -#include "wx/listctrl.h" -#include "wx/thread.h" -#include "wx/listctrl.h" +#include +#include +#include +#include +#include #include "MemoryWindow.h" #include "HW/CPU.h" #include "PowerPC/PowerPC.h" diff --git a/Source/Core/DebuggerWX/src/MemoryWindow.h b/Source/Core/DebuggerWX/src/MemoryWindow.h index 763d82cdfc..36c3b83944 100644 --- a/Source/Core/DebuggerWX/src/MemoryWindow.h +++ b/Source/Core/DebuggerWX/src/MemoryWindow.h @@ -18,9 +18,9 @@ #ifndef MEMORYWINDOW_H_ #define MEMORYWINDOW_H_ -#include "wx/dialog.h" -#include "wx/textctrl.h" -#include "wx/listbox.h" +#include +#include +#include #include "Debugger.h" #include "MemoryView.h" #include "Thread.h" diff --git a/Source/Core/DolphinWX/src/Frame.cpp b/Source/Core/DolphinWX/src/Frame.cpp index a95224b4b4..2501c182b3 100644 --- a/Source/Core/DolphinWX/src/Frame.cpp +++ b/Source/Core/DolphinWX/src/Frame.cpp @@ -29,7 +29,7 @@ #include "PluginManager.h" #include "MemcardManager.h" -#include "wx/mstream.h" +#include // ---------------------------------------------------------------------------- // resources diff --git a/Source/Core/DolphinWX/src/GameListCtrl.h b/Source/Core/DolphinWX/src/GameListCtrl.h index 8e600b9265..7148027562 100644 --- a/Source/Core/DolphinWX/src/GameListCtrl.h +++ b/Source/Core/DolphinWX/src/GameListCtrl.h @@ -20,7 +20,7 @@ #include -#include "wx/listctrl.h" +#include #include "ISOFile.h" diff --git a/Source/Core/DolphinWX/src/Globals.h b/Source/Core/DolphinWX/src/Globals.h index 0f71cca6c1..15625906c9 100644 --- a/Source/Core/DolphinWX/src/Globals.h +++ b/Source/Core/DolphinWX/src/Globals.h @@ -54,28 +54,28 @@ enum #define wxUSE_XPM_IN_MSW 1 #define USE_XPM_BITMAPS 1 -// For compilers that support precompilation, includes "wx/wx.h". -//#include "wx/wxprec.h" +// For compilers that support precompilation, includes . +//#include //#ifndef WX_PRECOMP -#include "wx/wx.h" +#include //#endif -#include "wx/toolbar.h" -#include "wx/log.h" -#include "wx/image.h" -#include "wx/aboutdlg.h" -#include "wx/filedlg.h" -#include "wx/spinctrl.h" -#include "wx/srchctrl.h" -#include "wx/listctrl.h" -#include "wx/progdlg.h" -#include "wx/imagpng.h" -#include "wx/button.h" -#include "wx/stattext.h" -#include "wx/choice.h" -#include "wx/cmdline.h" -#include "wx/busyinfo.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // define this to use XPMs everywhere (by default, BMPs are used under Win) // BMPs use less space, but aren't compiled into the executable on other platforms diff --git a/Source/Core/DolphinWX/src/MainNoGUI.cpp b/Source/Core/DolphinWX/src/MainNoGUI.cpp index e4b7263be0..57dcba4d7b 100644 --- a/Source/Core/DolphinWX/src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/src/MainNoGUI.cpp @@ -58,7 +58,7 @@ void Host_CloseDisplay(){} void Host_UpdateStatusBar(const char* _pText){} // Include SDL header so it can hijack main(). -#include "SDL.h" +#include int main(int argc, char* argv[]) { diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp index 639150ed27..9ee20ea6e5 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp @@ -20,7 +20,7 @@ #include #include -#include "dsoundstream.h" +#include "DSoundStream.h" namespace DSound { diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSoundStream.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/DSoundStream.cpp index 3b7eda1063..b59f330740 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/DSoundStream.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSoundStream.cpp @@ -20,7 +20,7 @@ #include #include -#include "dsoundstream.h" +#include "DSoundStream.h" namespace DSound { diff --git a/Source/Plugins/Plugin_PadSimple/Src/main.cpp b/Source/Plugins/Plugin_PadSimple/Src/main.cpp index dad1c99416..7ee3017cc9 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/main.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/main.cpp @@ -43,7 +43,7 @@ DInput dinput; #else -#include "SDL.h" +#include SDL_Joystick *joy; int numaxes = 0; int numbuttons = 0; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index f2d81f2001..71dd03b663 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -3,7 +3,7 @@ #include "Common.h" #include "D3DBase.h" -#include "D3Dtexture.h" +#include "D3DTexture.h" #include "Render.h" diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexLoader.cpp index fded121078..cfb1ca9f2a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexLoader.cpp @@ -84,7 +84,7 @@ inline float ReadBuffer32F() #include "VertexLoader_Position.h" #include "VertexLoader_Normal.h" #include "VertexLoader_Color.h" -#include "VertexLoader_textCoord.h" +#include "VertexLoader_TextCoord.h" VertexLoader g_VertexLoaders[8]; TVtxDesc VertexLoader::m_VtxDesc; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/ShellUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/ShellUtil.cpp index c38ec9f063..ce6b5f6dd9 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/ShellUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/ShellUtil.cpp @@ -1,5 +1,4 @@ -#include "shlobj.h" - +#include #include #include #include "ShellUtil.h" diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 7461bc0d46..d27512425e 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -15,10 +15,10 @@ #include "VertexHandler.h" #include "TransformEngine.h" #include "DlgSettings.h" -#include "D3DPostProcess.h" +#include "D3DPostprocess.h" #include "D3DTexture.h" #include "D3DUtil.h" -#include "W32Util/misc.h" +#include "W32Util/Misc.h" #include "EmuWindow.h" #include "Utils.h" diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.h b/Source/Plugins/Plugin_VideoDX9/Src/main.h index 85936a6de5..a172e8182e 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.h @@ -2,10 +2,10 @@ #define MAIN_H #include "PluginSpecs_Video.h" -#include "render.h" +#include "Render.h" extern SVideoInitialize g_VideoInitialize; void DebugLog(const char* _fmt, ...); -#endif \ No newline at end of file +#endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp index c4603d6d3c..aca83e087a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp @@ -19,7 +19,7 @@ #include "IniFile.h" #if defined(_WIN32) #include "svnrev.h" -#include "OS\Win32.h" +#include "OS/Win32.h" #endif #include "GLInit.h" @@ -27,7 +27,7 @@ #define USE_SDL 0 #endif #if USE_SDL -#include "SDL.h" +#include #endif // Handles OpenGL and the window diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h index 923a790145..a6eb9a35de 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h @@ -28,10 +28,10 @@ #define GLEW_STATIC -#include "GLew/glew.h" -#include "GLew/wglew.h" -#include "GLew/gl.h" -#include "GLew/glext.h" +#include +#include +#include +#include #else // linux basic definitions diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 653efee1f5..268f92faa6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -34,7 +34,7 @@ #include "XFB.h" #ifdef _WIN32 -#include "OS\Win32.h" +#include "OS/Win32.h" #else #endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 33c063caae..92edc64eb5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -18,11 +18,11 @@ #include "Globals.h" #ifdef _WIN32 -#include "OS\Win32.h" +#include "OS/Win32.h" #endif #if defined(__APPLE__) -#include "SDL.h" +#include #endif #include "GUI/ConfigDlg.h" @@ -96,7 +96,12 @@ void DllConfig(HWND _hParent) } if(!resFound) //and add the res - { resos[i] = strBuffer; i++; frame.AddFSReso(szBuffer); frame.AddWindowReso(szBuffer); } + { + resos[i] = strBuffer; + i++; + frame.AddFSReso(szBuffer); + frame.AddWindowReso(szBuffer); + } ZeroMemory(&dmi, sizeof(dmi)); } frame.ShowModal(); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index c01e4107d6..dae6f8be08 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -51,7 +51,7 @@ #include #include #include -#include "SDL.h" +#include #ifdef _WIN32 #define SLEEP(x) Sleep(x)