mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-24 15:01:16 +01:00
Include system headers using "#include <file.h>", so GCC will not issue warnings about them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
60a5a592f9
commit
734586a0ab
@ -15,8 +15,7 @@
|
||||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
#include <iostream>
|
||||
|
||||
#include "string.h"
|
||||
#include <cstring>
|
||||
|
||||
#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);
|
||||
}
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "MemoryCheckDlg.h"
|
||||
#include "IniFile.h"
|
||||
|
||||
#include "wx/mstream.h"
|
||||
#include <wx/mstream.h>
|
||||
|
||||
extern "C" {
|
||||
#include "../resources/toolbar_add_breakpoint.c"
|
||||
|
@ -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 <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/textdlg.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/thread.h>
|
||||
#include <wx/mstream.h>
|
||||
|
||||
// ugly that this lib included code from the main
|
||||
#include "../../DolphinWX/src/Globals.h"
|
||||
|
@ -18,9 +18,9 @@
|
||||
#ifndef CODEWINDOW_H_
|
||||
#define CODEWINDOW_H_
|
||||
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/listbox.h"
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
#include "Debugger.h"
|
||||
#include "CodeView.h"
|
||||
#include "Thread.h"
|
||||
|
@ -31,7 +31,7 @@ enum
|
||||
#define wxUSE_XPM_IN_MSW 1
|
||||
#define USE_XPM_BITMAPS 1
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include <wx/wx.h>
|
||||
|
||||
// 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
|
||||
|
@ -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 <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/thread.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include "JitWindow.h"
|
||||
#include "HW/CPU.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
|
@ -20,10 +20,10 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/listctrl.h"
|
||||
#include "wx/listbox.h"
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
#include "Debugger.h"
|
||||
#include "MemoryView.h"
|
||||
#include "Thread.h"
|
||||
|
@ -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 <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
#include <wx/checklst.h>
|
||||
|
||||
#include "LogWindow.h"
|
||||
#include "Console.h"
|
||||
|
@ -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 <wx/button.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/thread.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include "MemoryWindow.h"
|
||||
#include "HW/CPU.h"
|
||||
#include "PowerPC/PowerPC.h"
|
||||
|
@ -18,9 +18,9 @@
|
||||
#ifndef MEMORYWINDOW_H_
|
||||
#define MEMORYWINDOW_H_
|
||||
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/listbox.h"
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/listbox.h>
|
||||
#include "Debugger.h"
|
||||
#include "MemoryView.h"
|
||||
#include "Thread.h"
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "PluginManager.h"
|
||||
#include "MemcardManager.h"
|
||||
|
||||
#include "wx/mstream.h"
|
||||
#include <wx/mstream.h>
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// resources
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "wx/listctrl.h"
|
||||
#include <wx/listctrl.h>
|
||||
|
||||
#include "ISOFile.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 <wx/wx.h>.
|
||||
//#include <wx/wxprec.h>
|
||||
|
||||
//#ifndef WX_PRECOMP
|
||||
#include "wx/wx.h"
|
||||
#include <wx/wx.h>
|
||||
//#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 <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>
|
||||
|
||||
// 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
|
||||
|
@ -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 <SDL.h>
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <mmsystem.h>
|
||||
#include <dsound.h>
|
||||
|
||||
#include "dsoundstream.h"
|
||||
#include "DSoundStream.h"
|
||||
|
||||
namespace DSound
|
||||
{
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <mmsystem.h>
|
||||
#include <dsound.h>
|
||||
|
||||
#include "dsoundstream.h"
|
||||
#include "DSoundStream.h"
|
||||
|
||||
namespace DSound
|
||||
{
|
||||
|
@ -43,7 +43,7 @@ DInput dinput;
|
||||
|
||||
#else
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL.h>
|
||||
SDL_Joystick *joy;
|
||||
int numaxes = 0;
|
||||
int numbuttons = 0;
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "Common.h"
|
||||
|
||||
#include "D3DBase.h"
|
||||
#include "D3Dtexture.h"
|
||||
#include "D3DTexture.h"
|
||||
|
||||
#include "Render.h"
|
||||
|
||||
|
@ -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;
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "shlobj.h"
|
||||
|
||||
#include <shlobj.h>
|
||||
#include <xstring>
|
||||
#include <string>
|
||||
#include "ShellUtil.h"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
#endif
|
||||
|
@ -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 <SDL.h>
|
||||
#endif
|
||||
|
||||
// Handles OpenGL and the window
|
||||
|
@ -28,10 +28,10 @@
|
||||
|
||||
#define GLEW_STATIC
|
||||
|
||||
#include "GLew/glew.h"
|
||||
#include "GLew/wglew.h"
|
||||
#include "GLew/gl.h"
|
||||
#include "GLew/glext.h"
|
||||
#include <GLew/glew.h>
|
||||
#include <GLew/wglew.h>
|
||||
#include <GLew/gl.h>
|
||||
#include <GLew/glext.h>
|
||||
|
||||
#else // linux basic definitions
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "XFB.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "OS\Win32.h"
|
||||
#include "OS/Win32.h"
|
||||
#else
|
||||
#endif
|
||||
|
||||
|
@ -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 <SDL.h>
|
||||
#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();
|
||||
|
@ -51,7 +51,7 @@
|
||||
#include <vector>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include "SDL.h"
|
||||
#include <SDL.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define SLEEP(x) Sleep(x)
|
||||
|
Loading…
x
Reference in New Issue
Block a user